diff --git a/session/tidb_library_test.go b/server/tidb_library_test.go
similarity index 98%
rename from session/tidb_library_test.go
rename to server/tidb_library_test.go
index c025fd6339c51..8d895aa692e95 100644
--- a/session/tidb_library_test.go
+++ b/server/tidb_library_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package session_test
+package server_test
 
 import (
 	"runtime"
diff --git a/session/backup_restore_test.go b/session/backup_restore_test.go
index 305588a05255f..b8f8d8f34e0cc 100644
--- a/session/backup_restore_test.go
+++ b/session/backup_restore_test.go
@@ -33,7 +33,7 @@ func TestBackupAndRestore(t *testing.T) {
 		t.Skip("only run BR SQL integration test with tikv store")
 	}
 
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	cfg := config.GetGlobalConfig()
diff --git a/session/isolation_test.go b/session/isolation_test.go
index eafeee4ca0f97..9e211b103de2d 100644
--- a/session/isolation_test.go
+++ b/session/isolation_test.go
@@ -27,7 +27,7 @@ These test cases come from the paper <A Critique of ANSI SQL Isolation Levels>.
 The sign 'P0', 'P1'.... can be found in the paper. These cases will run under snapshot isolation.
 */
 func TestP0DirtyWrite(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -86,7 +86,7 @@ func TestP0DirtyWrite(t *testing.T) {
 }
 
 func TestP1DirtyRead(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -136,7 +136,7 @@ func TestP1DirtyRead(t *testing.T) {
 }
 
 func TestP2NonRepeatableRead(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -207,7 +207,7 @@ func TestP2NonRepeatableRead(t *testing.T) {
 }
 
 func TestP3Phantom(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -275,7 +275,7 @@ func TestP3Phantom(t *testing.T) {
 }
 
 func TestP4LostUpdate(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -336,7 +336,7 @@ func TestP4LostUpdate(t *testing.T) {
 func TestP4CLostUpdate(t *testing.T) {}
 
 func TestA3Phantom(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -389,7 +389,7 @@ func TestA3Phantom(t *testing.T) {
 }
 
 func TestA5AReadSkew(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -454,7 +454,7 @@ func TestA5AReadSkew(t *testing.T) {
 }
 
 func TestA5BWriteSkew(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -551,7 +551,7 @@ These test cases come from the paper <Highly Available Transactions: Virtues and
 for tidb, we support read-after-write on cluster level.
 */
 func TestReadAfterWrite(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
@@ -604,7 +604,7 @@ func TestReadAfterWrite(t *testing.T) {
 This case will do harm in Innodb, even if in snapshot isolation, but harmless in tidb.
 */
 func TestPhantomReadInInnodb(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	session1 := testkit.NewTestKit(t, store)
 	session2 := testkit.NewTestKit(t, store)
diff --git a/session/nontransactional_test.go b/session/nontransactional_test.go
index 7f3543f3e9997..d675a16827ed8 100644
--- a/session/nontransactional_test.go
+++ b/session/nontransactional_test.go
@@ -28,7 +28,7 @@ import (
 )
 
 func TestNonTransactionalDeleteSharding(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -70,7 +70,7 @@ func TestNonTransactionalDeleteSharding(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteDryRun(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -89,7 +89,7 @@ func TestNonTransactionalDeleteDryRun(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteErrorMessage(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -124,7 +124,7 @@ func TestNonTransactionalDeleteErrorMessage(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteSplitOnTiDBRowID(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -138,7 +138,7 @@ func TestNonTransactionalDeleteSplitOnTiDBRowID(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteNull(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -161,7 +161,7 @@ func TestNonTransactionalDeleteNull(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteSmallBatch(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=1024")
@@ -177,7 +177,7 @@ func TestNonTransactionalDeleteSmallBatch(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteShardOnGeneratedColumn(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -191,7 +191,7 @@ func TestNonTransactionalDeleteShardOnGeneratedColumn(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteAutoDetectShardColumn(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -229,7 +229,7 @@ func TestNonTransactionalDeleteAutoDetectShardColumn(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteInvisibleIndex(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -249,7 +249,7 @@ func TestNonTransactionalDeleteInvisibleIndex(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteIgnoreSelectLimit(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -264,7 +264,7 @@ func TestNonTransactionalDeleteIgnoreSelectLimit(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteReadStaleness(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set @@tidb_max_chunk_size=35")
@@ -280,7 +280,7 @@ func TestNonTransactionalDeleteReadStaleness(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteCheckConstraint(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 
@@ -348,7 +348,7 @@ func TestNonTransactionalDeleteCheckConstraint(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteOptimizerHints(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
@@ -361,7 +361,7 @@ func TestNonTransactionalDeleteOptimizerHints(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteMultiTables(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 
@@ -380,7 +380,7 @@ func TestNonTransactionalDeleteMultiTables(t *testing.T) {
 }
 
 func TestNonTransactionalDeleteAlias(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 
@@ -423,7 +423,7 @@ func TestNonTransactionalDeleteAlias(t *testing.T) {
 
 func TestNonTransactionalDeleteShardOnUnsupportedTypes(t *testing.T) {
 	// When some day the test fail because such types are supported, we can update related docs and consider remove the test.
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
diff --git a/session/session_fail_test.go b/session/session_fail_test.go
index 2e0b770c348ea..cc9ea66ab1a44 100644
--- a/session/session_fail_test.go
+++ b/session/session_fail_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 func TestFailStatementCommitInRetry(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
@@ -47,7 +47,7 @@ func TestFailStatementCommitInRetry(t *testing.T) {
 }
 
 func TestGetTSFailDirtyState(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
@@ -77,7 +77,7 @@ func TestGetTSFailDirtyStateInretry(t *testing.T) {
 		require.NoError(t, failpoint.Disable("tikvclient/mockGetTSErrorInRetry"))
 	}()
 
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
@@ -95,7 +95,7 @@ func TestGetTSFailDirtyStateInretry(t *testing.T) {
 func TestKillFlagInBackoff(t *testing.T) {
 	// This test checks the `killed` flag is passed down to the backoffer through
 	// session.KVVars.
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
@@ -113,7 +113,7 @@ func TestKillFlagInBackoff(t *testing.T) {
 }
 
 func TestClusterTableSendError(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
@@ -125,7 +125,7 @@ func TestClusterTableSendError(t *testing.T) {
 }
 
 func TestAutoCommitNeedNotLinearizability(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := createTestKit(t, store)
diff --git a/session/session_legacy_test.go b/session/session_legacy_test.go
index e4f24d731bd05..adc395ac012b4 100644
--- a/session/session_legacy_test.go
+++ b/session/session_legacy_test.go
@@ -24,11 +24,9 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"testing"
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/domain"
@@ -55,7 +53,6 @@ import (
 	"github.com/pingcap/tidb/store/mockstore/mockcopr"
 	"github.com/pingcap/tidb/table/tables"
 	"github.com/pingcap/tidb/tablecodec"
-	newTestkit "github.com/pingcap/tidb/testkit"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util"
 	"github.com/pingcap/tidb/util/memory"
@@ -63,11 +60,9 @@ import (
 	"github.com/pingcap/tidb/util/testkit"
 	"github.com/pingcap/tidb/util/testleak"
 	"github.com/pingcap/tipb/go-binlog"
-	"github.com/stretchr/testify/require"
 	"github.com/tikv/client-go/v2/testutils"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/txnkv/transaction"
-	clientv3 "go.etcd.io/etcd/client/v3"
 	"google.golang.org/grpc"
 )
 
@@ -103,61 +98,6 @@ type testSessionSerialSuite struct {
 	testSessionSuiteBase
 }
 
-func clearStorage(store kv.Storage) error {
-	txn, err := store.Begin()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	iter, err := txn.Iter(nil, nil)
-	if err != nil {
-		return errors.Trace(err)
-	}
-	for iter.Valid() {
-		txn.Delete(iter.Key())
-		if err := iter.Next(); err != nil {
-			return errors.Trace(err)
-		}
-	}
-	return txn.Commit(context.Background())
-}
-
-func clearETCD(ebd kv.EtcdBackend) error {
-	endpoints, err := ebd.EtcdAddrs()
-	if err != nil {
-		return err
-	}
-	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:        endpoints,
-		AutoSyncInterval: 30 * time.Second,
-		DialTimeout:      5 * time.Second,
-		DialOptions: []grpc.DialOption{
-			grpc.WithBackoffMaxDelay(time.Second * 3),
-		},
-		TLS: ebd.TLSConfig(),
-	})
-	if err != nil {
-		return errors.Trace(err)
-	}
-	defer cli.Close()
-
-	resp, err := cli.Get(context.Background(), "/tidb", clientv3.WithPrefix())
-	if err != nil {
-		return errors.Trace(err)
-	}
-	for _, kv := range resp.Kvs {
-		if kv.Lease != 0 {
-			if _, err := cli.Revoke(context.Background(), clientv3.LeaseID(kv.Lease)); err != nil {
-				return errors.Trace(err)
-			}
-		}
-	}
-	_, err = cli.Delete(context.Background(), "/tidb", clientv3.WithPrefix())
-	if err != nil {
-		return errors.Trace(err)
-	}
-	return nil
-}
-
 func (s *testSessionSuiteBase) SetUpSuite(c *C) {
 	testleak.BeforeTest()
 
@@ -169,9 +109,9 @@ func (s *testSessionSuiteBase) SetUpSuite(c *C) {
 		})
 		store, err := d.Open(fmt.Sprintf("tikv://%s?disableGC=true", s.pdAddr))
 		c.Assert(err, IsNil)
-		err = clearStorage(store)
+		err = clearTiKVStorage(store)
 		c.Assert(err, IsNil)
-		err = clearETCD(store.(kv.EtcdBackend))
+		err = clearEtcdStorage(store.(kv.EtcdBackend))
 		c.Assert(err, IsNil)
 		session.ResetStoreForWithTiKVTest(store)
 		s.store = store
@@ -215,33 +155,6 @@ func (s *testSessionSuiteBase) TearDownTest(c *C) {
 	}
 }
 
-func createStorage(t *testing.T) (kv.Storage, func()) {
-	store, _, clean := createStorageAndDomain(t)
-	return store, clean
-}
-
-func createStorageAndDomain(t *testing.T) (kv.Storage, *domain.Domain, func()) {
-	if *withTiKV {
-		var d driver.TiKVDriver
-		config.UpdateGlobal(func(conf *config.Config) {
-			conf.TxnLocalLatches.Enabled = false
-		})
-		store, err := d.Open("tikv://127.0.0.1:2379?disableGC=true")
-		require.NoError(t, err)
-		require.NoError(t, clearStorage(store))
-		require.NoError(t, clearETCD(store.(kv.EtcdBackend)))
-		session.ResetStoreForWithTiKVTest(store)
-		dom, err := session.BootstrapSession(store)
-		require.NoError(t, err)
-
-		return store, dom, func() {
-			dom.Close()
-			require.NoError(t, store.Close())
-		}
-	}
-	return newTestkit.CreateMockStoreAndDomain(t)
-}
-
 type mockBinlogPump struct {
 }
 
@@ -3223,187 +3136,6 @@ func (s *testSessionSuite2) TestSetEnableRateLimitAction(c *C) {
 	c.Assert(haveRateLimitAction, IsFalse)
 }
 
-func (s *testSessionSuite3) TestSetVarHint(c *C) {
-	tk := testkit.NewTestKitWithInit(c, s.store)
-
-	tk.Se.GetSessionVars().SetSystemVar("sql_mode", mysql.DefaultSQLMode)
-	tk.MustQuery("SELECT /*+ SET_VAR(sql_mode=ALLOW_INVALID_DATES) */ @@sql_mode;").Check(testkit.Rows("ALLOW_INVALID_DATES"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@sql_mode;").Check(testkit.Rows(mysql.DefaultSQLMode))
-
-	tk.Se.GetSessionVars().SetSystemVar("tmp_table_size", "16777216")
-	tk.MustQuery("SELECT /*+ SET_VAR(tmp_table_size=1024) */ @@tmp_table_size;").Check(testkit.Rows("1024"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@tmp_table_size;").Check(testkit.Rows("16777216"))
-
-	tk.Se.GetSessionVars().SetSystemVar("range_alloc_block_size", "4096")
-	tk.MustQuery("SELECT /*+ SET_VAR(range_alloc_block_size=4294967295) */ @@range_alloc_block_size;").Check(testkit.Rows("4294967295"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@range_alloc_block_size;").Check(testkit.Rows("4096"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_execution_time", "0")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_execution_time=1) */ @@max_execution_time;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_execution_time;").Check(testkit.Rows("0"))
-
-	tk.Se.GetSessionVars().SetSystemVar("time_zone", "SYSTEM")
-	tk.MustQuery("SELECT /*+ SET_VAR(time_zone='+12:00') */ @@time_zone;").Check(testkit.Rows("+12:00"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@time_zone;").Check(testkit.Rows("SYSTEM"))
-
-	tk.Se.GetSessionVars().SetSystemVar("join_buffer_size", "262144")
-	tk.MustQuery("SELECT /*+ SET_VAR(join_buffer_size=128) */ @@join_buffer_size;").Check(testkit.Rows("128"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@join_buffer_size;").Check(testkit.Rows("262144"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_length_for_sort_data", "1024")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_length_for_sort_data=4) */ @@max_length_for_sort_data;").Check(testkit.Rows("4"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_length_for_sort_data;").Check(testkit.Rows("1024"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_error_count", "64")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_error_count=0) */ @@max_error_count;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_error_count;").Check(testkit.Rows("64"))
-
-	tk.Se.GetSessionVars().SetSystemVar("sql_buffer_result", "OFF")
-	tk.MustQuery("SELECT /*+ SET_VAR(sql_buffer_result=ON) */ @@sql_buffer_result;").Check(testkit.Rows("ON"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@sql_buffer_result;").Check(testkit.Rows("OFF"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_heap_table_size", "16777216")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_heap_table_size=16384) */ @@max_heap_table_size;").Check(testkit.Rows("16384"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_heap_table_size;").Check(testkit.Rows("16777216"))
-
-	tk.Se.GetSessionVars().SetSystemVar("tmp_table_size", "16777216")
-	tk.MustQuery("SELECT /*+ SET_VAR(tmp_table_size=16384) */ @@tmp_table_size;").Check(testkit.Rows("16384"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@tmp_table_size;").Check(testkit.Rows("16777216"))
-
-	tk.Se.GetSessionVars().SetSystemVar("div_precision_increment", "4")
-	tk.MustQuery("SELECT /*+ SET_VAR(div_precision_increment=0) */ @@div_precision_increment;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@div_precision_increment;").Check(testkit.Rows("4"))
-
-	tk.Se.GetSessionVars().SetSystemVar("sql_auto_is_null", "OFF")
-	tk.Se.GetSessionVars().SetSystemVar("tidb_enable_noop_functions", "ON")
-	tk.MustQuery("SELECT /*+ SET_VAR(sql_auto_is_null=1) */ @@sql_auto_is_null;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.Se.GetSessionVars().SetSystemVar("tidb_enable_noop_functions", "OFF")
-	tk.MustQuery("SELECT @@sql_auto_is_null;").Check(testkit.Rows("0"))
-
-	tk.Se.GetSessionVars().SetSystemVar("sort_buffer_size", "262144")
-	tk.MustQuery("SELECT /*+ SET_VAR(sort_buffer_size=32768) */ @@sort_buffer_size;").Check(testkit.Rows("32768"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@sort_buffer_size;").Check(testkit.Rows("262144"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_join_size", "18446744073709551615")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_join_size=1) */ @@max_join_size;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_join_size;").Check(testkit.Rows("18446744073709551615"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_seeks_for_key", "18446744073709551615")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_seeks_for_key=1) */ @@max_seeks_for_key;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_seeks_for_key;").Check(testkit.Rows("18446744073709551615"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_sort_length", "1024")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_sort_length=4) */ @@max_sort_length;").Check(testkit.Rows("4"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_sort_length;").Check(testkit.Rows("1024"))
-
-	tk.Se.GetSessionVars().SetSystemVar("bulk_insert_buffer_size", "8388608")
-	tk.MustQuery("SELECT /*+ SET_VAR(bulk_insert_buffer_size=0) */ @@bulk_insert_buffer_size;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@bulk_insert_buffer_size;").Check(testkit.Rows("8388608"))
-
-	tk.Se.GetSessionVars().SetSystemVar("sql_big_selects", "1")
-	tk.MustQuery("SELECT /*+ SET_VAR(sql_big_selects=0) */ @@sql_big_selects;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@sql_big_selects;").Check(testkit.Rows("1"))
-
-	tk.Se.GetSessionVars().SetSystemVar("read_rnd_buffer_size", "262144")
-	tk.MustQuery("SELECT /*+ SET_VAR(read_rnd_buffer_size=1) */ @@read_rnd_buffer_size;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@read_rnd_buffer_size;").Check(testkit.Rows("262144"))
-
-	tk.Se.GetSessionVars().SetSystemVar("unique_checks", "1")
-	tk.MustQuery("SELECT /*+ SET_VAR(unique_checks=0) */ @@unique_checks;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@unique_checks;").Check(testkit.Rows("1"))
-
-	tk.Se.GetSessionVars().SetSystemVar("read_buffer_size", "131072")
-	tk.MustQuery("SELECT /*+ SET_VAR(read_buffer_size=8192) */ @@read_buffer_size;").Check(testkit.Rows("8192"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@read_buffer_size;").Check(testkit.Rows("131072"))
-
-	tk.Se.GetSessionVars().SetSystemVar("default_tmp_storage_engine", "InnoDB")
-	tk.MustQuery("SELECT /*+ SET_VAR(default_tmp_storage_engine='CSV') */ @@default_tmp_storage_engine;").Check(testkit.Rows("CSV"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@default_tmp_storage_engine;").Check(testkit.Rows("InnoDB"))
-
-	tk.Se.GetSessionVars().SetSystemVar("optimizer_search_depth", "62")
-	tk.MustQuery("SELECT /*+ SET_VAR(optimizer_search_depth=1) */ @@optimizer_search_depth;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@optimizer_search_depth;").Check(testkit.Rows("62"))
-
-	tk.Se.GetSessionVars().SetSystemVar("max_points_in_geometry", "65536")
-	tk.MustQuery("SELECT /*+ SET_VAR(max_points_in_geometry=3) */ @@max_points_in_geometry;").Check(testkit.Rows("3"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@max_points_in_geometry;").Check(testkit.Rows("65536"))
-
-	tk.Se.GetSessionVars().SetSystemVar("updatable_views_with_limit", "YES")
-	tk.MustQuery("SELECT /*+ SET_VAR(updatable_views_with_limit=0) */ @@updatable_views_with_limit;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@updatable_views_with_limit;").Check(testkit.Rows("YES"))
-
-	tk.Se.GetSessionVars().SetSystemVar("optimizer_prune_level", "1")
-	tk.MustQuery("SELECT /*+ SET_VAR(optimizer_prune_level=0) */ @@optimizer_prune_level;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@optimizer_prune_level;").Check(testkit.Rows("1"))
-
-	tk.Se.GetSessionVars().SetSystemVar("group_concat_max_len", "1024")
-	tk.MustQuery("SELECT /*+ SET_VAR(group_concat_max_len=4) */ @@group_concat_max_len;").Check(testkit.Rows("4"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@group_concat_max_len;").Check(testkit.Rows("1024"))
-
-	tk.Se.GetSessionVars().SetSystemVar("eq_range_index_dive_limit", "200")
-	tk.MustQuery("SELECT /*+ SET_VAR(eq_range_index_dive_limit=0) */ @@eq_range_index_dive_limit;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@eq_range_index_dive_limit;").Check(testkit.Rows("200"))
-
-	tk.Se.GetSessionVars().SetSystemVar("sql_safe_updates", "0")
-	tk.MustQuery("SELECT /*+ SET_VAR(sql_safe_updates=1) */ @@sql_safe_updates;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@sql_safe_updates;").Check(testkit.Rows("0"))
-
-	tk.Se.GetSessionVars().SetSystemVar("end_markers_in_json", "0")
-	tk.MustQuery("SELECT /*+ SET_VAR(end_markers_in_json=1) */ @@end_markers_in_json;").Check(testkit.Rows("1"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@end_markers_in_json;").Check(testkit.Rows("0"))
-
-	tk.Se.GetSessionVars().SetSystemVar("windowing_use_high_precision", "ON")
-	tk.MustQuery("SELECT /*+ SET_VAR(windowing_use_high_precision=OFF) */ @@windowing_use_high_precision;").Check(testkit.Rows("0"))
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-	tk.MustQuery("SELECT @@windowing_use_high_precision;").Check(testkit.Rows("1"))
-
-	tk.MustExec("SELECT /*+ SET_VAR(sql_safe_updates = 1) SET_VAR(max_heap_table_size = 1G) */ 1;")
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 0)
-
-	tk.MustExec("SELECT /*+ SET_VAR(collation_server = 'utf8') */ 1;")
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 1)
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings()[0].Err.Error(), Equals, "[planner:3637]Variable 'collation_server' cannot be set using SET_VAR hint.")
-
-	tk.MustExec("SELECT /*+ SET_VAR(max_size = 1G) */ 1;")
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 1)
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings()[0].Err.Error(), Equals, "[planner:3128]Unresolved name 'max_size' for SET_VAR hint")
-
-	tk.MustExec("SELECT /*+ SET_VAR(group_concat_max_len = 1024) SET_VAR(group_concat_max_len = 2048) */ 1;")
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings(), HasLen, 1)
-	c.Assert(tk.Se.GetSessionVars().StmtCtx.GetWarnings()[0].Err.Error(), Equals, "[planner:3126]Hint SET_VAR(group_concat_max_len=2048) is ignored as conflicting/duplicated.")
-}
-
 func (s *testSessionSerialSuite) TestDoDDLJobQuit(c *C) {
 	// test https://github.com/pingcap/tidb/issues/18714, imitate DM's use environment
 	// use isolated store, because in below failpoint we will cancel its context
@@ -4615,231 +4347,3 @@ func (s *testSessionSuite) TestTemporaryTableInterceptor(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(val, BytesEquals, []byte("v1"))
 }
-
-func (s *testSessionSuite) TestTiDBReadStaleness(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	tk.MustExec("set @@tidb_read_staleness='-5'")
-	tk.MustExec("set @@tidb_read_staleness='-100'")
-	err := tk.ExecToErr("set @@tidb_read_staleness='-5s'")
-	c.Assert(err, NotNil)
-	err = tk.ExecToErr("set @@tidb_read_staleness='foo'")
-	c.Assert(err, NotNil)
-	tk.MustExec("set @@tidb_read_staleness=''")
-	tk.MustExec("set @@tidb_read_staleness='0'")
-}
-
-func (s *testSessionSuite) TestFixSetTiDBSnapshotTS(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	safePointName := "tikv_gc_safe_point"
-	safePointValue := "20160102-15:04:05 -0700"
-	safePointComment := "All versions after safe point can be accessed. (DO NOT EDIT)"
-	updateSafePoint := fmt.Sprintf(`INSERT INTO mysql.tidb VALUES ('%[1]s', '%[2]s', '%[3]s')
-	ON DUPLICATE KEY
-	UPDATE variable_value = '%[2]s', comment = '%[3]s'`, safePointName, safePointValue, safePointComment)
-	tk.MustExec(updateSafePoint)
-	tk.MustExec("create database t123")
-	time.Sleep(time.Second)
-	ts := time.Now().Format("2006-1-2 15:04:05")
-	time.Sleep(time.Second)
-	tk.MustExec("drop database t123")
-	err := tk.ExecToErr("use t123")
-	c.Assert(err, NotNil)
-	c.Assert(err.Error(), Matches, ".*Unknown database.*")
-	tk.MustExec(fmt.Sprintf("set @@tidb_snapshot='%s'", ts))
-	tk.MustExec("use t123")
-	// update any session variable and assert whether infoschema is changed
-	tk.MustExec("SET SESSION sql_mode = 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER';")
-	tk.MustExec("use t123")
-}
-
-func (s *testSessionSuite) TestSetPDClientDynmaicOption(c *C) {
-	var err error
-	tk := testkit.NewTestKit(c, s.store)
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 0.5;")
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0.5"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 1;")
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("1"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 1.5;")
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("1.5"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 10;")
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
-	err = tk.ExecToErr("set tidb_tso_client_batch_max_wait_time = 0;")
-	c.Assert(err, NotNil)
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = -1;")
-	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '-1'"))
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = -0.1;")
-	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '-0.1'"))
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 10.1;")
-	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '10.1'"))
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
-	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 11;")
-	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '11'"))
-	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
-
-	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("0"))
-	tk.MustExec("set global tidb_enable_tso_follower_proxy = on;")
-	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("1"))
-	tk.MustExec("set global tidb_enable_tso_follower_proxy = off;")
-	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("0"))
-	err = tk.ExecToErr("set tidb_tso_client_batch_max_wait_time = 0;")
-	c.Assert(err, NotNil)
-}
-
-func (s *testSessionSuite) TestSameNameObjectWithLocalTemporaryTable(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	tk.MustExec("use test")
-	tk.MustExec("drop table if exists t1")
-	tk.MustExec("drop sequence if exists s1")
-	tk.MustExec("drop view if exists v1")
-
-	// prepare
-	tk.MustExec("create table t1 (a int)")
-	defer tk.MustExec("drop table if exists t1")
-	tk.MustQuery("show create table t1").Check(testkit.Rows(
-		"t1 CREATE TABLE `t1` (\n" +
-			"  `a` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-
-	tk.MustExec("create view v1 as select 1")
-	defer tk.MustExec("drop view if exists v1")
-	tk.MustQuery("show create view v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
-	tk.MustQuery("show create table v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
-
-	tk.MustExec("create sequence s1")
-	defer tk.MustExec("drop sequence if exists s1")
-	tk.MustQuery("show create sequence s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
-	tk.MustQuery("show create table s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
-
-	// temp table
-	tk.MustExec("create temporary table t1 (ct1 int)")
-	tk.MustQuery("show create table t1").Check(testkit.Rows(
-		"t1 CREATE TEMPORARY TABLE `t1` (\n" +
-			"  `ct1` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-
-	tk.MustExec("create temporary table v1 (cv1 int)")
-	tk.MustQuery("show create view v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
-	tk.MustQuery("show create table v1").Check(testkit.Rows(
-		"v1 CREATE TEMPORARY TABLE `v1` (\n" +
-			"  `cv1` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-
-	tk.MustExec("create temporary table s1 (cs1 int)")
-	tk.MustQuery("show create sequence s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
-	tk.MustQuery("show create table s1").Check(testkit.Rows(
-		"s1 CREATE TEMPORARY TABLE `s1` (\n" +
-			"  `cs1` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-
-	// drop
-	tk.MustExec("drop view v1")
-	err := tk.ExecToErr("show create view v1")
-	c.Assert(err.Error(), Equals, "[schema:1146]Table 'test.v1' doesn't exist")
-	tk.MustQuery("show create table v1").Check(testkit.Rows(
-		"v1 CREATE TEMPORARY TABLE `v1` (\n" +
-			"  `cv1` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-
-	tk.MustExec("drop sequence s1")
-	err = tk.ExecToErr("show create sequence s1")
-	c.Assert(err.Error(), Equals, "[schema:1146]Table 'test.s1' doesn't exist")
-	tk.MustQuery("show create table s1").Check(testkit.Rows(
-		"s1 CREATE TEMPORARY TABLE `s1` (\n" +
-			"  `cs1` int(11) DEFAULT NULL\n" +
-			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
-}
-
-func (s *testSessionSuite) TestWriteOnMultipleCachedTable(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	tk.MustExec("use test")
-	tk.MustExec("drop table if exists ct1, ct2")
-	tk.MustExec("create table ct1 (id int, c int)")
-	tk.MustExec("create table ct2 (id int, c int)")
-	tk.MustExec("alter table ct1 cache")
-	tk.MustExec("alter table ct2 cache")
-	tk.MustQuery("select * from ct1").Check(testkit.Rows())
-	tk.MustQuery("select * from ct2").Check(testkit.Rows())
-
-	lastReadFromCache := func(tk *testkit.TestKit) bool {
-		return tk.Se.GetSessionVars().StmtCtx.ReadFromTableCache
-	}
-
-	cached := false
-	for i := 0; i < 50; i++ {
-		tk.MustQuery("select * from ct1")
-		if lastReadFromCache(tk) {
-			cached = true
-			break
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	c.Assert(cached, IsTrue)
-
-	tk.MustExec("begin")
-	tk.MustExec("insert into ct1 values (3, 4)")
-	tk.MustExec("insert into ct2 values (5, 6)")
-	tk.MustExec("commit")
-
-	tk.MustQuery("select * from ct1").Check(testkit.Rows("3 4"))
-	tk.MustQuery("select * from ct2").Check(testkit.Rows("5 6"))
-
-	// cleanup
-	tk.MustExec("alter table ct1 nocache")
-	tk.MustExec("alter table ct2 nocache")
-}
-
-func (s *testSessionSuite) TestForbidSettingBothTSVariable(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	// For mocktikv, safe point is not initialized, we manually insert it for snapshot to use.
-	safePointName := "tikv_gc_safe_point"
-	safePointValue := "20060102-15:04:05 -0700"
-	safePointComment := "All versions after safe point can be accessed. (DO NOT EDIT)"
-	updateSafePoint := fmt.Sprintf(`INSERT INTO mysql.tidb VALUES ('%[1]s', '%[2]s', '%[3]s')
-	ON DUPLICATE KEY
-	UPDATE variable_value = '%[2]s', comment = '%[3]s'`, safePointName, safePointValue, safePointComment)
-	tk.MustExec(updateSafePoint)
-
-	// Set tidb_snapshot and assert tidb_read_staleness
-	tk.MustExec("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'")
-	_, err := tk.Exec("set @@tidb_read_staleness='-5'")
-	c.Assert(err, NotNil)
-	c.Assert(err.Error(), Equals, "tidb_snapshot should be clear before setting tidb_read_staleness")
-	tk.MustExec("set @@tidb_snapshot = ''")
-	tk.MustExec("set @@tidb_read_staleness='-5'")
-
-	// Set tidb_read_staleness and assert tidb_snapshot
-	tk.MustExec("set @@tidb_read_staleness='-5'")
-	_, err = tk.Exec("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'")
-	c.Assert(err, NotNil)
-	c.Assert(err.Error(), Equals, "tidb_read_staleness should be clear before setting tidb_snapshot")
-	tk.MustExec("set @@tidb_read_staleness = ''")
-	tk.MustExec("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'")
-}
-
-func (s *testSessionSuite) TestSysdateIsNow(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-	tk.MustExec("use test")
-	tk.MustQuery("show variables like '%tidb_sysdate_is_now%'").Check(testkit.Rows("tidb_sysdate_is_now OFF"))
-	c.Assert(tk.Se.GetSessionVars().SysdateIsNow, IsFalse)
-	tk.MustExec("set @@tidb_sysdate_is_now=true")
-	tk.MustQuery("show variables like '%tidb_sysdate_is_now%'").Check(testkit.Rows("tidb_sysdate_is_now ON"))
-	c.Assert(tk.Se.GetSessionVars().SysdateIsNow, IsTrue)
-}
-
-func (s *testSessionSuite) TestEnableLegacyInstanceScope(c *C) {
-	tk := testkit.NewTestKit(c, s.store)
-
-	// enable 'switching' to SESSION variables
-	tk.MustExec("set tidb_enable_legacy_instance_scope = 1")
-	tk.MustExec("set tidb_general_log = 1")
-	tk.MustQuery(`show warnings`).Check(testkit.Rows(fmt.Sprintf("Warning %d modifying tidb_general_log will require SET GLOBAL in a future version of TiDB", errno.ErrInstanceScope)))
-	c.Assert(tk.Se.GetSessionVars().EnableLegacyInstanceScope, IsTrue)
-
-	// disable 'switching' to SESSION variables
-	tk.MustExec("set tidb_enable_legacy_instance_scope = 0")
-	tk.MustGetErrCode("set tidb_general_log = 1", errno.ErrGlobalVariable)
-	c.Assert(tk.Se.GetSessionVars().EnableLegacyInstanceScope, IsFalse)
-}
diff --git a/session/session_test.go b/session/session_test.go
new file mode 100644
index 0000000000000..1eed88061b011
--- /dev/null
+++ b/session/session_test.go
@@ -0,0 +1,545 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package session_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/config"
+	"github.com/pingcap/tidb/domain"
+	"github.com/pingcap/tidb/errno"
+	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/parser/mysql"
+	"github.com/pingcap/tidb/session"
+	"github.com/pingcap/tidb/store/driver"
+	"github.com/pingcap/tidb/testkit"
+	"github.com/stretchr/testify/require"
+	clientv3 "go.etcd.io/etcd/client/v3"
+	"google.golang.org/grpc"
+)
+
+func clearTiKVStorage(store kv.Storage) error {
+	txn, err := store.Begin()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	iter, err := txn.Iter(nil, nil)
+	if err != nil {
+		return errors.Trace(err)
+	}
+	for iter.Valid() {
+		if err := txn.Delete(iter.Key()); err != nil {
+			return errors.Trace(err)
+		}
+		if err := iter.Next(); err != nil {
+			return errors.Trace(err)
+		}
+	}
+	return txn.Commit(context.Background())
+}
+
+func clearEtcdStorage(ebd kv.EtcdBackend) error {
+	endpoints, err := ebd.EtcdAddrs()
+	if err != nil {
+		return err
+	}
+	cli, err := clientv3.New(clientv3.Config{
+		Endpoints:        endpoints,
+		AutoSyncInterval: 30 * time.Second,
+		DialTimeout:      5 * time.Second,
+		DialOptions: []grpc.DialOption{
+			grpc.WithBackoffMaxDelay(time.Second * 3),
+		},
+		TLS: ebd.TLSConfig(),
+	})
+	if err != nil {
+		return errors.Trace(err)
+	}
+	defer cli.Close()
+
+	resp, err := cli.Get(context.Background(), "/tidb", clientv3.WithPrefix())
+	if err != nil {
+		return errors.Trace(err)
+	}
+	for _, kv := range resp.Kvs {
+		if kv.Lease != 0 {
+			if _, err := cli.Revoke(context.Background(), clientv3.LeaseID(kv.Lease)); err != nil {
+				return errors.Trace(err)
+			}
+		}
+	}
+	_, err = cli.Delete(context.Background(), "/tidb", clientv3.WithPrefix())
+	if err != nil {
+		return errors.Trace(err)
+	}
+	return nil
+}
+
+func createMockStoreAndSetup(t *testing.T) (kv.Storage, func()) {
+	store, _, clean := createMockStoreAndDomainAndSetup(t)
+	return store, clean
+}
+
+func createMockStoreAndDomainAndSetup(t *testing.T) (kv.Storage, *domain.Domain, func()) {
+	if *withTiKV {
+		var d driver.TiKVDriver
+		config.UpdateGlobal(func(conf *config.Config) {
+			conf.TxnLocalLatches.Enabled = false
+		})
+		store, err := d.Open("tikv://127.0.0.1:2379?disableGC=true")
+		require.NoError(t, err)
+		require.NoError(t, clearTiKVStorage(store))
+		require.NoError(t, clearEtcdStorage(store.(kv.EtcdBackend)))
+		session.ResetStoreForWithTiKVTest(store)
+		dom, err := session.BootstrapSession(store)
+		require.NoError(t, err)
+
+		return store, dom, func() {
+			dom.Close()
+			require.NoError(t, store.Close())
+		}
+	}
+	return testkit.CreateMockStoreAndDomain(t)
+}
+
+func TestSysdateIsNow(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustQuery("show variables like '%tidb_sysdate_is_now%'").Check(testkit.Rows("tidb_sysdate_is_now OFF"))
+	require.False(t, tk.Session().GetSessionVars().SysdateIsNow)
+	tk.MustExec("set @@tidb_sysdate_is_now=true")
+	tk.MustQuery("show variables like '%tidb_sysdate_is_now%'").Check(testkit.Rows("tidb_sysdate_is_now ON"))
+	require.True(t, tk.Session().GetSessionVars().SysdateIsNow)
+}
+
+func TestEnableLegacyInstanceScope(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+
+	// enable 'switching' to SESSION variables
+	tk.MustExec("set tidb_enable_legacy_instance_scope = 1")
+	tk.MustExec("set tidb_general_log = 1")
+	tk.MustQuery(`show warnings`).Check(testkit.Rows(fmt.Sprintf("Warning %d modifying tidb_general_log will require SET GLOBAL in a future version of TiDB", errno.ErrInstanceScope)))
+	require.True(t, tk.Session().GetSessionVars().EnableLegacyInstanceScope)
+
+	// disable 'switching' to SESSION variables
+	tk.MustExec("set tidb_enable_legacy_instance_scope = 0")
+	tk.MustGetErrCode("set tidb_general_log = 1", errno.ErrGlobalVariable)
+	require.False(t, tk.Session().GetSessionVars().EnableLegacyInstanceScope)
+}
+
+func TestSetPDClientDynamicOption(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 0.5;")
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0.5"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 1;")
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("1"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 1.5;")
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("1.5"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 10;")
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
+	require.Error(t, tk.ExecToErr("set tidb_tso_client_batch_max_wait_time = 0;"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = -1;")
+	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '-1'"))
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = -0.1;")
+	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '-0.1'"))
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("0"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 10.1;")
+	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '10.1'"))
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
+	tk.MustExec("set global tidb_tso_client_batch_max_wait_time = 11;")
+	tk.MustQuery("show warnings").Check(testkit.RowsWithSep("|", "Warning|1292|Truncated incorrect tidb_tso_client_batch_max_wait_time value: '11'"))
+	tk.MustQuery("select @@tidb_tso_client_batch_max_wait_time;").Check(testkit.Rows("10"))
+
+	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("0"))
+	tk.MustExec("set global tidb_enable_tso_follower_proxy = on;")
+	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("1"))
+	tk.MustExec("set global tidb_enable_tso_follower_proxy = off;")
+	tk.MustQuery("select @@tidb_enable_tso_follower_proxy;").Check(testkit.Rows("0"))
+	require.Error(t, tk.ExecToErr("set tidb_tso_client_batch_max_wait_time = 0;"))
+}
+
+func TestSameNameObjectWithLocalTemporaryTable(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t1")
+	tk.MustExec("drop sequence if exists s1")
+	tk.MustExec("drop view if exists v1")
+
+	// prepare
+	tk.MustExec("create table t1 (a int)")
+	defer tk.MustExec("drop table if exists t1")
+	tk.MustQuery("show create table t1").Check(testkit.Rows(
+		"t1 CREATE TABLE `t1` (\n" +
+			"  `a` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	tk.MustExec("create view v1 as select 1")
+	defer tk.MustExec("drop view if exists v1")
+	tk.MustQuery("show create view v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
+	tk.MustQuery("show create table v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
+
+	tk.MustExec("create sequence s1")
+	defer tk.MustExec("drop sequence if exists s1")
+	tk.MustQuery("show create sequence s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
+	tk.MustQuery("show create table s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
+
+	// temp table
+	tk.MustExec("create temporary table t1 (ct1 int)")
+	tk.MustQuery("show create table t1").Check(testkit.Rows(
+		"t1 CREATE TEMPORARY TABLE `t1` (\n" +
+			"  `ct1` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	tk.MustExec("create temporary table v1 (cv1 int)")
+	tk.MustQuery("show create view v1").Check(testkit.Rows("v1 CREATE ALGORITHM=UNDEFINED DEFINER=``@`` SQL SECURITY DEFINER VIEW `v1` (`1`) AS SELECT 1 AS `1` utf8mb4 utf8mb4_bin"))
+	tk.MustQuery("show create table v1").Check(testkit.Rows(
+		"v1 CREATE TEMPORARY TABLE `v1` (\n" +
+			"  `cv1` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	tk.MustExec("create temporary table s1 (cs1 int)")
+	tk.MustQuery("show create sequence s1").Check(testkit.Rows("s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB"))
+	tk.MustQuery("show create table s1").Check(testkit.Rows(
+		"s1 CREATE TEMPORARY TABLE `s1` (\n" +
+			"  `cs1` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	// drop
+	tk.MustExec("drop view v1")
+	tk.MustGetErrMsg("show create view v1", "[schema:1146]Table 'test.v1' doesn't exist")
+	tk.MustQuery("show create table v1").Check(testkit.Rows(
+		"v1 CREATE TEMPORARY TABLE `v1` (\n" +
+			"  `cv1` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	tk.MustExec("drop sequence s1")
+	tk.MustGetErrMsg("show create sequence s1", "[schema:1146]Table 'test.s1' doesn't exist")
+	tk.MustQuery("show create table s1").Check(testkit.Rows(
+		"s1 CREATE TEMPORARY TABLE `s1` (\n" +
+			"  `cs1` int(11) DEFAULT NULL\n" +
+			") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+}
+
+func TestWriteOnMultipleCachedTable(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists ct1, ct2")
+	tk.MustExec("create table ct1 (id int, c int)")
+	tk.MustExec("create table ct2 (id int, c int)")
+	tk.MustExec("alter table ct1 cache")
+	tk.MustExec("alter table ct2 cache")
+	tk.MustQuery("select * from ct1").Check(testkit.Rows())
+	tk.MustQuery("select * from ct2").Check(testkit.Rows())
+
+	lastReadFromCache := func(tk *testkit.TestKit) bool {
+		return tk.Session().GetSessionVars().StmtCtx.ReadFromTableCache
+	}
+
+	cached := false
+	for i := 0; i < 50; i++ {
+		tk.MustQuery("select * from ct1")
+		if lastReadFromCache(tk) {
+			cached = true
+			break
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	require.True(t, cached)
+
+	tk.MustExec("begin")
+	tk.MustExec("insert into ct1 values (3, 4)")
+	tk.MustExec("insert into ct2 values (5, 6)")
+	tk.MustExec("commit")
+
+	tk.MustQuery("select * from ct1").Check(testkit.Rows("3 4"))
+	tk.MustQuery("select * from ct2").Check(testkit.Rows("5 6"))
+
+	// cleanup
+	tk.MustExec("alter table ct1 nocache")
+	tk.MustExec("alter table ct2 nocache")
+}
+
+func TestForbidSettingBothTSVariable(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	// For mock tikv, safe point is not initialized, we manually insert it for snapshot to use.
+	safePointName := "tikv_gc_safe_point"
+	safePointValue := "20060102-15:04:05 -0700"
+	safePointComment := "All versions after safe point can be accessed. (DO NOT EDIT)"
+	updateSafePoint := fmt.Sprintf(`INSERT INTO mysql.tidb VALUES ('%[1]s', '%[2]s', '%[3]s')
+	ON DUPLICATE KEY
+	UPDATE variable_value = '%[2]s', comment = '%[3]s'`, safePointName, safePointValue, safePointComment)
+	tk.MustExec(updateSafePoint)
+
+	// Set tidb_snapshot and assert tidb_read_staleness
+	tk.MustExec("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'")
+	tk.MustGetErrMsg("set @@tidb_read_staleness='-5'", "tidb_snapshot should be clear before setting tidb_read_staleness")
+	tk.MustExec("set @@tidb_snapshot = ''")
+	tk.MustExec("set @@tidb_read_staleness='-5'")
+
+	// Set tidb_read_staleness and assert tidb_snapshot
+	tk.MustExec("set @@tidb_read_staleness='-5'")
+	tk.MustGetErrMsg("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'", "tidb_read_staleness should be clear before setting tidb_snapshot")
+	tk.MustExec("set @@tidb_read_staleness = ''")
+	tk.MustExec("set @@tidb_snapshot = '2007-01-01 15:04:05.999999'")
+}
+
+func TestTiDBReadStaleness(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("set @@tidb_read_staleness='-5'")
+	tk.MustExec("set @@tidb_read_staleness='-100'")
+	err := tk.ExecToErr("set @@tidb_read_staleness='-5s'")
+	require.Error(t, err)
+	err = tk.ExecToErr("set @@tidb_read_staleness='foo'")
+	require.Error(t, err)
+	tk.MustExec("set @@tidb_read_staleness=''")
+	tk.MustExec("set @@tidb_read_staleness='0'")
+}
+
+func TestFixSetTiDBSnapshotTS(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	safePointName := "tikv_gc_safe_point"
+	safePointValue := "20160102-15:04:05 -0700"
+	safePointComment := "All versions after safe point can be accessed. (DO NOT EDIT)"
+	updateSafePoint := fmt.Sprintf(`INSERT INTO mysql.tidb VALUES ('%[1]s', '%[2]s', '%[3]s')
+	ON DUPLICATE KEY
+	UPDATE variable_value = '%[2]s', comment = '%[3]s'`, safePointName, safePointValue, safePointComment)
+	tk.MustExec(updateSafePoint)
+	tk.MustExec("create database t123")
+	time.Sleep(time.Second)
+	ts := time.Now().Format("2006-1-2 15:04:05")
+	time.Sleep(time.Second)
+	tk.MustExec("drop database t123")
+	tk.MustMatchErrMsg("use t123", ".*Unknown database.*")
+	tk.MustExec(fmt.Sprintf("set @@tidb_snapshot='%s'", ts))
+	tk.MustExec("use t123")
+	// update any session variable and assert whether infoschema is changed
+	tk.MustExec("SET SESSION sql_mode = 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER';")
+	tk.MustExec("use t123")
+}
+
+func TestSetVarHint(t *testing.T) {
+	store, clean := createMockStoreAndSetup(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sql_mode", mysql.DefaultSQLMode))
+	tk.MustQuery("SELECT /*+ SET_VAR(sql_mode=ALLOW_INVALID_DATES) */ @@sql_mode;").Check(testkit.Rows("ALLOW_INVALID_DATES"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@sql_mode;").Check(testkit.Rows(mysql.DefaultSQLMode))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("tmp_table_size", "16777216"))
+	tk.MustQuery("SELECT /*+ SET_VAR(tmp_table_size=1024) */ @@tmp_table_size;").Check(testkit.Rows("1024"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@tmp_table_size;").Check(testkit.Rows("16777216"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("range_alloc_block_size", "4096"))
+	tk.MustQuery("SELECT /*+ SET_VAR(range_alloc_block_size=4294967295) */ @@range_alloc_block_size;").Check(testkit.Rows("4294967295"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@range_alloc_block_size;").Check(testkit.Rows("4096"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_execution_time", "0"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_execution_time=1) */ @@max_execution_time;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_execution_time;").Check(testkit.Rows("0"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("time_zone", "SYSTEM"))
+	tk.MustQuery("SELECT /*+ SET_VAR(time_zone='+12:00') */ @@time_zone;").Check(testkit.Rows("+12:00"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@time_zone;").Check(testkit.Rows("SYSTEM"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("join_buffer_size", "262144"))
+	tk.MustQuery("SELECT /*+ SET_VAR(join_buffer_size=128) */ @@join_buffer_size;").Check(testkit.Rows("128"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@join_buffer_size;").Check(testkit.Rows("262144"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_length_for_sort_data", "1024"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_length_for_sort_data=4) */ @@max_length_for_sort_data;").Check(testkit.Rows("4"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_length_for_sort_data;").Check(testkit.Rows("1024"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_error_count", "64"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_error_count=0) */ @@max_error_count;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_error_count;").Check(testkit.Rows("64"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sql_buffer_result", "OFF"))
+	tk.MustQuery("SELECT /*+ SET_VAR(sql_buffer_result=ON) */ @@sql_buffer_result;").Check(testkit.Rows("ON"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@sql_buffer_result;").Check(testkit.Rows("OFF"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_heap_table_size", "16777216"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_heap_table_size=16384) */ @@max_heap_table_size;").Check(testkit.Rows("16384"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_heap_table_size;").Check(testkit.Rows("16777216"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("tmp_table_size", "16777216"))
+	tk.MustQuery("SELECT /*+ SET_VAR(tmp_table_size=16384) */ @@tmp_table_size;").Check(testkit.Rows("16384"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@tmp_table_size;").Check(testkit.Rows("16777216"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("div_precision_increment", "4"))
+	tk.MustQuery("SELECT /*+ SET_VAR(div_precision_increment=0) */ @@div_precision_increment;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@div_precision_increment;").Check(testkit.Rows("4"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sql_auto_is_null", "OFF"))
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("tidb_enable_noop_functions", "ON"))
+	tk.MustQuery("SELECT /*+ SET_VAR(sql_auto_is_null=1) */ @@sql_auto_is_null;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("tidb_enable_noop_functions", "OFF"))
+	tk.MustQuery("SELECT @@sql_auto_is_null;").Check(testkit.Rows("0"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sort_buffer_size", "262144"))
+	tk.MustQuery("SELECT /*+ SET_VAR(sort_buffer_size=32768) */ @@sort_buffer_size;").Check(testkit.Rows("32768"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@sort_buffer_size;").Check(testkit.Rows("262144"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_join_size", "18446744073709551615"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_join_size=1) */ @@max_join_size;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_join_size;").Check(testkit.Rows("18446744073709551615"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_seeks_for_key", "18446744073709551615"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_seeks_for_key=1) */ @@max_seeks_for_key;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_seeks_for_key;").Check(testkit.Rows("18446744073709551615"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_sort_length", "1024"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_sort_length=4) */ @@max_sort_length;").Check(testkit.Rows("4"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_sort_length;").Check(testkit.Rows("1024"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("bulk_insert_buffer_size", "8388608"))
+	tk.MustQuery("SELECT /*+ SET_VAR(bulk_insert_buffer_size=0) */ @@bulk_insert_buffer_size;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@bulk_insert_buffer_size;").Check(testkit.Rows("8388608"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sql_big_selects", "1"))
+	tk.MustQuery("SELECT /*+ SET_VAR(sql_big_selects=0) */ @@sql_big_selects;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@sql_big_selects;").Check(testkit.Rows("1"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("read_rnd_buffer_size", "262144"))
+	tk.MustQuery("SELECT /*+ SET_VAR(read_rnd_buffer_size=1) */ @@read_rnd_buffer_size;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@read_rnd_buffer_size;").Check(testkit.Rows("262144"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("unique_checks", "1"))
+	tk.MustQuery("SELECT /*+ SET_VAR(unique_checks=0) */ @@unique_checks;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@unique_checks;").Check(testkit.Rows("1"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("read_buffer_size", "131072"))
+	tk.MustQuery("SELECT /*+ SET_VAR(read_buffer_size=8192) */ @@read_buffer_size;").Check(testkit.Rows("8192"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@read_buffer_size;").Check(testkit.Rows("131072"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("default_tmp_storage_engine", "InnoDB"))
+	tk.MustQuery("SELECT /*+ SET_VAR(default_tmp_storage_engine='CSV') */ @@default_tmp_storage_engine;").Check(testkit.Rows("CSV"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@default_tmp_storage_engine;").Check(testkit.Rows("InnoDB"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("optimizer_search_depth", "62"))
+	tk.MustQuery("SELECT /*+ SET_VAR(optimizer_search_depth=1) */ @@optimizer_search_depth;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@optimizer_search_depth;").Check(testkit.Rows("62"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("max_points_in_geometry", "65536"))
+	tk.MustQuery("SELECT /*+ SET_VAR(max_points_in_geometry=3) */ @@max_points_in_geometry;").Check(testkit.Rows("3"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@max_points_in_geometry;").Check(testkit.Rows("65536"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("updatable_views_with_limit", "YES"))
+	tk.MustQuery("SELECT /*+ SET_VAR(updatable_views_with_limit=0) */ @@updatable_views_with_limit;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@updatable_views_with_limit;").Check(testkit.Rows("YES"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("optimizer_prune_level", "1"))
+	tk.MustQuery("SELECT /*+ SET_VAR(optimizer_prune_level=0) */ @@optimizer_prune_level;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@optimizer_prune_level;").Check(testkit.Rows("1"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("group_concat_max_len", "1024"))
+	tk.MustQuery("SELECT /*+ SET_VAR(group_concat_max_len=4) */ @@group_concat_max_len;").Check(testkit.Rows("4"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@group_concat_max_len;").Check(testkit.Rows("1024"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("eq_range_index_dive_limit", "200"))
+	tk.MustQuery("SELECT /*+ SET_VAR(eq_range_index_dive_limit=0) */ @@eq_range_index_dive_limit;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@eq_range_index_dive_limit;").Check(testkit.Rows("200"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("sql_safe_updates", "0"))
+	tk.MustQuery("SELECT /*+ SET_VAR(sql_safe_updates=1) */ @@sql_safe_updates;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@sql_safe_updates;").Check(testkit.Rows("0"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("end_markers_in_json", "0"))
+	tk.MustQuery("SELECT /*+ SET_VAR(end_markers_in_json=1) */ @@end_markers_in_json;").Check(testkit.Rows("1"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@end_markers_in_json;").Check(testkit.Rows("0"))
+
+	require.NoError(t, tk.Session().GetSessionVars().SetSystemVar("windowing_use_high_precision", "ON"))
+	tk.MustQuery("SELECT /*+ SET_VAR(windowing_use_high_precision=OFF) */ @@windowing_use_high_precision;").Check(testkit.Rows("0"))
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+	tk.MustQuery("SELECT @@windowing_use_high_precision;").Check(testkit.Rows("1"))
+
+	tk.MustExec("SELECT /*+ SET_VAR(sql_safe_updates = 1) SET_VAR(max_heap_table_size = 1G) */ 1;")
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 0)
+
+	tk.MustExec("SELECT /*+ SET_VAR(collation_server = 'utf8') */ 1;")
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 1)
+	require.EqualError(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings()[0].Err, "[planner:3637]Variable 'collation_server' cannot be set using SET_VAR hint.")
+
+	tk.MustExec("SELECT /*+ SET_VAR(max_size = 1G) */ 1;")
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 1)
+	require.EqualError(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings()[0].Err, "[planner:3128]Unresolved name 'max_size' for SET_VAR hint")
+
+	tk.MustExec("SELECT /*+ SET_VAR(group_concat_max_len = 1024) SET_VAR(group_concat_max_len = 2048) */ 1;")
+	require.Len(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings(), 1)
+	require.EqualError(t, tk.Session().GetSessionVars().StmtCtx.GetWarnings()[0].Err, "[planner:3126]Hint SET_VAR(group_concat_max_len=2048) is ignored as conflicting/duplicated.")
+}
diff --git a/session/statistics_test.go b/session/statistics_test.go
index 29097a186754e..83e6d3cc8f7d3 100644
--- a/session/statistics_test.go
+++ b/session/statistics_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestNewCollationStatsWithPrefixIndex(t *testing.T) {
-	store, dom, clean := createStorageAndDomain(t)
+	store, dom, clean := createMockStoreAndDomainAndSetup(t)
 	defer clean()
 	defer func() {
 		tk := testkit.NewTestKit(t, store)
diff --git a/session/txn_state_test.go b/session/txn_state_test.go
index 9b2c6d52b20a6..6e087a166bb34 100644
--- a/session/txn_state_test.go
+++ b/session/txn_state_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 func TestBasicTxnState(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -119,7 +119,7 @@ func TestBasicTxnState(t *testing.T) {
 }
 
 func TestEntriesCountAndSize(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -138,7 +138,7 @@ func TestEntriesCountAndSize(t *testing.T) {
 }
 
 func TestRunning(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -161,7 +161,7 @@ func TestRunning(t *testing.T) {
 }
 
 func TestBlocked(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk1 := testkit.NewTestKit(t, store)
@@ -188,7 +188,7 @@ func TestBlocked(t *testing.T) {
 }
 
 func TestCommitting(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk1 := testkit.NewTestKit(t, store)
@@ -217,7 +217,7 @@ func TestCommitting(t *testing.T) {
 }
 
 func TestRollbackTxnState(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -239,7 +239,7 @@ func TestRollbackTxnState(t *testing.T) {
 }
 
 func TestTxnInfoWithPreparedStmt(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -271,7 +271,7 @@ func TestTxnInfoWithPreparedStmt(t *testing.T) {
 }
 
 func TestTxnInfoWithScalarSubquery(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)
@@ -302,7 +302,7 @@ func TestTxnInfoWithScalarSubquery(t *testing.T) {
 }
 
 func TestTxnInfoWithPSProtocol(t *testing.T) {
-	store, clean := createStorage(t)
+	store, clean := createMockStoreAndSetup(t)
 	defer clean()
 
 	tk := testkit.NewTestKit(t, store)