diff --git a/pkg/executor/executor_test.go b/pkg/executor/executor_test.go
index 250f506d2bcc8..5eae6cf76a104 100644
--- a/pkg/executor/executor_test.go
+++ b/pkg/executor/executor_test.go
@@ -22,6 +22,15 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestChangePumpAndDrainer(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	// change pump or drainer's state need connect to etcd
+	// so will meet error "URL scheme must be http, https, unix, or unixs: /tmp/tidb"
+	tk.MustMatchErrMsg("change pump to node_state ='paused' for node_id 'pump1'", "URL scheme must be http, https, unix, or unixs.*")
+	tk.MustMatchErrMsg("change drainer to node_state ='paused' for node_id 'drainer1'", "URL scheme must be http, https, unix, or unixs.*")
+}
+
 func TestSetOperationOnDiffColType(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
diff --git a/pkg/session/test/vars/BUILD.bazel b/pkg/session/test/vars/BUILD.bazel
index c4cbd087f307a..e8339b10e245a 100644
--- a/pkg/session/test/vars/BUILD.bazel
+++ b/pkg/session/test/vars/BUILD.bazel
@@ -8,7 +8,7 @@ go_test(
         "vars_test.go",
     ],
     flaky = True,
-    shard_count = 7,
+    shard_count = 8,
     deps = [
         "//pkg/config",
         "//pkg/domain",
diff --git a/pkg/session/test/vars/vars_test.go b/pkg/session/test/vars/vars_test.go
index 4668201346680..61673f6a77057 100644
--- a/pkg/session/test/vars/vars_test.go
+++ b/pkg/session/test/vars/vars_test.go
@@ -85,6 +85,58 @@ func TestRemovedSysVars(t *testing.T) {
 	tk.MustContainErrMsg("SELECT @@GLOBAL.bogus_var", "[variable:1193]Unknown system variable 'bogus_var'")
 }
 
+func TestTiKVSystemVars(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+
+	result := tk.MustQuery("SHOW GLOBAL VARIABLES LIKE 'tidb_gc_enable'") // default is on from the sysvar
+	result.Check(testkit.Rows("tidb_gc_enable ON"))
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable'")
+	result.Check(testkit.Rows()) // but no value in the table (yet) because the value has not been set and the GC has never been run
+
+	// update will set a value in the table
+	tk.MustExec("SET GLOBAL tidb_gc_enable = 1")
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable'")
+	result.Check(testkit.Rows("true"))
+
+	tk.MustExec("UPDATE mysql.tidb SET variable_value = 'false' WHERE variable_name='tikv_gc_enable'")
+	result = tk.MustQuery("SELECT @@tidb_gc_enable;")
+	result.Check(testkit.Rows("0")) // reads from mysql.tidb value and changes to false
+
+	tk.MustExec("SET GLOBAL tidb_gc_concurrency = -1") // sets auto concurrency and concurrency
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency'")
+	result.Check(testkit.Rows("true"))
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency'")
+	result.Check(testkit.Rows("-1"))
+
+	tk.MustExec("SET GLOBAL tidb_gc_concurrency = 5") // sets auto concurrency and concurrency
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency'")
+	result.Check(testkit.Rows("false"))
+	result = tk.MustQuery("SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency'")
+	result.Check(testkit.Rows("5"))
+
+	tk.MustExec("UPDATE mysql.tidb SET variable_value = 'true' WHERE variable_name='tikv_gc_auto_concurrency'")
+	result = tk.MustQuery("SELECT @@tidb_gc_concurrency;")
+	result.Check(testkit.Rows("-1")) // because auto_concurrency is turned on it takes precedence
+
+	tk.MustExec("REPLACE INTO mysql.tidb (variable_value, variable_name) VALUES ('15m', 'tikv_gc_run_interval')")
+	result = tk.MustQuery("SELECT @@GLOBAL.tidb_gc_run_interval;")
+	result.Check(testkit.Rows("15m0s"))
+	result = tk.MustQuery("SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval'")
+	result.Check(testkit.Rows("tidb_gc_run_interval 15m0s"))
+
+	tk.MustExec("SET GLOBAL tidb_gc_run_interval = '9m'") // too small
+	tk.MustQuery("SHOW WARNINGS").Check(testkit.Rows("Warning 1292 Truncated incorrect tidb_gc_run_interval value: '9m'"))
+	result = tk.MustQuery("SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval'")
+	result.Check(testkit.Rows("tidb_gc_run_interval 10m0s"))
+
+	tk.MustExec("SET GLOBAL tidb_gc_run_interval = '700000000000ns'") // specified in ns, also valid
+
+	_, err := tk.Exec("SET GLOBAL tidb_gc_run_interval = '11mins'")
+	require.Equal(t, "[variable:1232]Incorrect argument type to variable 'tidb_gc_run_interval'", err.Error())
+}
+
 func TestUpgradeSysvars(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 
diff --git a/tests/integrationtest/r/executor/admin.result b/tests/integrationtest/r/executor/admin.result
index 5ec10a53cd878..0f75f9bbee557 100644
--- a/tests/integrationtest/r/executor/admin.result
+++ b/tests/integrationtest/r/executor/admin.result
@@ -41,11 +41,8 @@ create table cache_admin_test (c1 int, c2 int, c3 int default 1, index (c1), uni
 insert cache_admin_test (c1, c2) values (1, 1), (2, 2), (5, 5), (10, 10), (11, 11);
 alter table cache_admin_test cache;
 admin check table cache_admin_test;
-
 admin check index cache_admin_test c1;
-
 admin check index cache_admin_test c2;
-
 alter table cache_admin_test nocache;
 drop table if exists cache_admin_test;
 drop table if exists check_index_test;
@@ -69,11 +66,7 @@ create table cache_admin_table_without_index_test (id int, count int, PRIMARY KE
 alter table cache_admin_table_with_index_test cache;
 alter table cache_admin_table_without_index_test cache;
 admin checksum table cache_admin_table_with_index_test;
-Db_name	Table_name	Checksum_crc64_xor	Total_kvs	Total_bytes
-executor__admin	cache_admin_table_with_index_test	0	2	2
 admin checksum table cache_admin_table_without_index_test;
-Db_name	Table_name	Checksum_crc64_xor	Total_kvs	Total_bytes
-executor__admin	cache_admin_table_without_index_test	1	1	1
 alter table cache_admin_table_with_index_test nocache;
 alter table cache_admin_table_without_index_test nocache;
 drop table if exists cache_admin_table_with_index_test,cache_admin_table_without_index_test;
diff --git a/tests/integrationtest/r/executor/executor.result b/tests/integrationtest/r/executor/executor.result
index 469772256a1bd..7ea042a6cd496 100644
--- a/tests/integrationtest/r/executor/executor.result
+++ b/tests/integrationtest/r/executor/executor.result
@@ -1258,10 +1258,6 @@ commit;
 select a from t where id=1;
 a
 2
-change pump to node_state ='paused' for node_id 'pump1';
-Error 1105 (HY000): URL scheme must be http, https, unix, or unixs: 
-change drainer to node_state ='paused' for node_id 'drainer1';
-Error 1105 (HY000): URL scheme must be http, https, unix, or unixs: 
 drop table if exists select_limit;
 create table select_limit(id int not null default 1, name varchar(255), PRIMARY KEY(id));
 insert INTO select_limit VALUES (1, "hello");
diff --git a/tests/integrationtest/r/expression/builtin.result b/tests/integrationtest/r/expression/builtin.result
index b2a7d175e27a9..fb25c9d8b558c 100644
--- a/tests/integrationtest/r/expression/builtin.result
+++ b/tests/integrationtest/r/expression/builtin.result
@@ -700,28 +700,20 @@ create table tb5(a double, b float);
 insert into tb5 (a, b) values (184467440737095516160, 184467440737095516160);
 select * from tb5 where cast(a as unsigned int)=0;
 a	b
-Level	Code	Message
-Warning	1690	constant 1.844674407370955e+20 overflows bigint
 select * from tb5 where cast(b as unsigned int)=0;
 a	b
-Level	Code	Message
-Warning	1690	constant 1.844674407370955e+20 overflows bigint
 drop table tb5;
 create table tb5(a double, b bigint unsigned);
 insert into tb5 (a, b) values (18446744073709551616, 18446744073709551615);
 select * from tb5 where cast(a as unsigned int)=b;
 a	b
 1.8446744073709552e19	18446744073709551615
-Level	Code	Message
-Warning	1690	constant 1.8446744073709552e+19 overflows bigint
 drop table tb5;
 create table tb5(a json, b bigint unsigned);
 insert into tb5 (a, b) values ('184467440737095516160', 18446744073709551615);
 select * from tb5 where cast(a as unsigned int)=b;
 a	b
 184467440737095500000	18446744073709551615
-Level	Code	Message
-Warning	1690	constant 1.844674407370955e+20 overflows bigint
 select * from tb5 where cast(b as unsigned int)=0;
 a	b
 drop table tb5;
@@ -729,8 +721,6 @@ create table tb5(a json, b bigint unsigned);
 insert into tb5 (a, b) values ('92233720368547758080', 18446744073709551615);
 select * from tb5 where cast(a as signed int)=b;
 a	b
-Level	Code	Message
-Warning	1690	constant 9.223372036854776e+19 overflows bigint
 drop table tb5;
 create table tb5(a bigint(64) unsigned,b varchar(50));
 insert into tb5(a, b) values (9223372036854775808, '9223372036854775808');
@@ -1893,20 +1883,18 @@ MySQL	123	123
 select unhex('string'), unhex('你好'), unhex(123.4), unhex(null);
 unhex('string')	unhex('你好')	unhex(123.4)	unhex(null)
 NULL	NULL	NULL	NULL
-select ltrim('   bar   '), ltrim('bar'), ltrim(''), ltrim(null);
-ltrim('   bar   ')	ltrim('bar')	ltrim('')	ltrim(null)
-bar   	bar		NULL
-select rtrim('   bar   '), rtrim('bar'), rtrim(''), rtrim(null);
-rtrim('   bar   ')	rtrim('bar')	rtrim('')	rtrim(null)
-   bar	bar		NULL
-select ltrim("\t   bar   "), ltrim("   \tbar"), ltrim("\n  bar"), ltrim("\r  bar");
-ltrim("\t   bar   ")	ltrim("   \tbar")	ltrim("\n  bar")	ltrim("\r  bar")
-	   bar   		bar	
-  bar	
  bar
-select rtrim("   bar   \t"), rtrim("bar\t   "), rtrim("bar   \n"), rtrim("bar   \r");
-rtrim("   bar   \t")	rtrim("bar\t   ")	rtrim("bar   \n")	rtrim("bar   \r")
-   bar   		bar		bar   
-	bar   
+select hex(ltrim('   bar   ')), hex(ltrim('bar')), hex(ltrim('')), hex(ltrim(null));
+hex(ltrim('   bar   '))	hex(ltrim('bar'))	hex(ltrim(''))	hex(ltrim(null))
+626172202020	626172		NULL
+select hex(rtrim('   bar   ')), hex(rtrim('bar')), hex(rtrim('')), hex(rtrim(null));
+hex(rtrim('   bar   '))	hex(rtrim('bar'))	hex(rtrim(''))	hex(rtrim(null))
+202020626172	626172		NULL
+select hex(ltrim("\t   bar   ")), hex(ltrim("   \tbar")), hex(ltrim("\n  bar")), hex(ltrim("\r  bar"));
+hex(ltrim("\t   bar   "))	hex(ltrim("   \tbar"))	hex(ltrim("\n  bar"))	hex(ltrim("\r  bar"))
+09202020626172202020	09626172	0A2020626172	0D2020626172
+select hex(rtrim("   bar   \t")), hex(rtrim("bar\t   ")), hex(rtrim("bar   \n")), hex(rtrim("bar   \r"));
+hex(rtrim("   bar   \t"))	hex(rtrim("bar\t   "))	hex(rtrim("bar   \n"))	hex(rtrim("bar   \r"))
+20202062617220202009	62617209	6261722020200A	6261722020200D
 DROP TABLE IF EXISTS t;
 CREATE TABLE t(a BINARY(6));
 INSERT INTO t VALUES("中文");
@@ -1919,18 +1907,17 @@ hex(REVERSE(123))	hex(REVERSE(12.09))
 select trim('   bar   '), trim(leading 'x' from 'xxxbarxxx'), trim(trailing 'xyz' from 'barxxyz'), trim(both 'x' from 'xxxbarxxx');
 trim('   bar   ')	trim(leading 'x' from 'xxxbarxxx')	trim(trailing 'xyz' from 'barxxyz')	trim(both 'x' from 'xxxbarxxx')
 bar	barxxx	barx	bar
-select trim('\t   bar\n   '), trim('   \rbar   \t');
-trim('\t   bar\n   ')	trim('   \rbar   \t')
-	   bar
-	
bar   	
-select trim(leading from '   bar'), trim('x' from 'xxxbarxxx'), trim('x' from 'bar'), trim('' from '   bar   ');
-trim(leading from '   bar')	trim('x' from 'xxxbarxxx')	trim('x' from 'bar')	trim('' from '   bar   ')
-bar	bar	bar	   bar   
-select trim(''), trim('x' from '');
-trim('')	trim('x' from '')
+select hex(trim('\t   bar\n   ')), hex(trim('   \rbar   \t'));
+hex(trim('\t   bar\n   '))	hex(trim('   \rbar   \t'))
+092020206261720A	0D62617220202009
+select hex(trim(leading from '   bar')), hex(trim('x' from 'xxxbarxxx')), hex(trim('x' from 'bar')), hex(trim('' from '   bar   '));
+hex(trim(leading from '   bar'))	hex(trim('x' from 'xxxbarxxx'))	hex(trim('x' from 'bar'))	hex(trim('' from '   bar   '))
+626172	626172	626172	202020626172202020
+select hex(trim('')), hex(trim('x' from ''));
+hex(trim(''))	hex(trim('x' from ''))
 	
-select trim(null from 'bar'), trim('x' from null), trim(null), trim(leading null from 'bar');
-trim(null from 'bar')	trim('x' from null)	trim(null)	trim(leading null from 'bar')
+select hex(trim(null from 'bar')), hex(trim('x' from null)), hex(trim(null)), hex(trim(leading null from 'bar'));
+hex(trim(null from 'bar'))	hex(trim('x' from null))	hex(trim(null))	hex(trim(leading null from 'bar'))
 NULL	NULL	NULL	NULL
 drop table if exists t;
 create table t(a char(20), b int, c double, d datetime, e time, f binary(5));
@@ -2328,8 +2315,6 @@ select cast(12 as signed) - cast(-9223372036854775808 as signed);
 Error 1690 (22003): BIGINT value is out of range in '(12 - -9223372036854775808)'
 create table tb5(a int(10));
 insert into tb5 (a) values (10);
-select * from tb5 where a - -9223372036854775808;
-Error 1690 (22003): BIGINT value is out of range in '(Column#0 - -9223372036854775808)'
 drop table tb5;
 select cast(-9223372036854775808 as unsigned) - (-9223372036854775807);
 cast(-9223372036854775808 as unsigned) - (-9223372036854775807)
@@ -2468,8 +2453,6 @@ create table t(a double);
 insert into t value(1.2);
 select * from t where a/0 > 1;
 a
-Level	Code	Message
-Warning	1365	Division by 0
 DROP TABLE IF EXISTS t;
 CREATE TABLE t(a BIGINT, b DECIMAL(6, 2));
 INSERT INTO t VALUES(0, 1.12), (1, 1.21);
diff --git a/tests/integrationtest/r/expression/charset_and_collation.result b/tests/integrationtest/r/expression/charset_and_collation.result
index 0ef76c5943d6b..551c015572d6f 100644
--- a/tests/integrationtest/r/expression/charset_and_collation.result
+++ b/tests/integrationtest/r/expression/charset_and_collation.result
@@ -745,9 +745,6 @@ a	b	c	d	e	f	g	h	i
 1	啊	啊	啊  	啊  	啊	啊  	🐸	🐸
 admin check table t;
 
-admin recover index t a;
-ADDED_COUNT	SCAN_COUNT
-0	1
 alter table t add column n char(10) COLLATE utf8mb4_unicode_ci;
 alter table t add index n(n);
 update t set n = '吧';
diff --git a/tests/integrationtest/r/expression/issues.result b/tests/integrationtest/r/expression/issues.result
index cdcb894fcfa4a..6683ecc626934 100644
--- a/tests/integrationtest/r/expression/issues.result
+++ b/tests/integrationtest/r/expression/issues.result
@@ -2169,18 +2169,6 @@ a	A	a	A
 select * from t t1 left join t t2 on t1.a = t2.b collate utf8mb4_general_ci;
 a	b	a	b
 a	A	a	A
-drop table if exists t;
-create table t(a varchar(10) collate utf8mb4_bin, b varchar(10) collate utf8mb4_general_ci);
-insert into t (a, b) values ('a', 'A');
-select * from t where field('A', a collate utf8mb4_general_ci, b) > 1;
-a	b
-select * from t where field('A', a, b collate utf8mb4_general_ci) > 1;
-a	b
-select * from t where field('A' collate utf8mb4_general_ci, a, b) > 1;
-a	b
-select * from t where field('A', a, b) > 1;
-a	b
-a	A
 set names utf8mb4 collate utf8mb4_general_ci;
 select collation(concat(1 collate `binary`));
 collation(concat(1 collate `binary`))
@@ -2763,15 +2751,9 @@ insert into t values('1e649'),('-1e649');
 SELECT * FROM t where c < 1;
 c
 -1e649
-Level	Code	Message
-Warning	1292	Truncated incorrect DOUBLE value: '-1e649'
-Warning	1292	Truncated incorrect DOUBLE value: '1e649'
 SELECT * FROM t where c > 1;
 c
 1e649
-Level	Code	Message
-Warning	1292	Truncated incorrect DOUBLE value: '-1e649'
-Warning	1292	Truncated incorrect DOUBLE value: '1e649'
 drop table if exists t;
 create table t(a int);
 insert t values (1);
diff --git a/tests/integrationtest/r/planner/core/plan_cache.result b/tests/integrationtest/r/planner/core/plan_cache.result
index a392e65f91515..ef9194b7a5c52 100644
--- a/tests/integrationtest/r/planner/core/plan_cache.result
+++ b/tests/integrationtest/r/planner/core/plan_cache.result
@@ -257,8 +257,7 @@ col1
 471841432147994.4981
 492790234219503.0846
 729024465529090.5423
-create database test_40296;
-use test_40296;
+drop table if exists IDT_MULTI15880STROBJSTROBJ;
 CREATE TABLE IDT_MULTI15880STROBJSTROBJ (
 COL1 enum('aa','bb','cc','dd','ff','gg','kk','ll','mm','ee') DEFAULT NULL,
 COL2 decimal(20,0) DEFAULT NULL,
@@ -275,7 +274,7 @@ ee	-9605492323393070105	0850-03-15
 select @@last_plan_from_cache;
 @@last_plan_from_cache
 0
-use planner__core__plan_cache
+set session tidb_enable_non_prepared_plan_cache=default;
 CREATE TABLE UK_SIGNED_19385 (
 COL1 decimal(37,4) unsigned DEFAULT '101.0000' COMMENT 'WITH DEFAULT',
 COL2 varchar(20) DEFAULT NULL,
@@ -288,24 +287,6 @@ select * from UK_SIGNED_19385 where col1 = 999999999999999999999999999999999.999
 col1 * 999999999999999999999999999999999.9999 between 999999999999999999999999999999999.9999 and
 999999999999999999999999999999999.9999;
 COL1	COL2	COL4	COL3	COL5
-CREATE TABLE IDT_20290 (
-COL1 mediumtext DEFAULT NULL,
-COL2 decimal(52,7) DEFAULT NULL,
-COL3 datetime DEFAULT NULL,
-KEY U_M_COL (COL1(10),COL2,COL3) /*!80000 INVISIBLE */);
-INSERT INTO IDT_20290 VALUES
-('',210255309400.4264137,'4273-04-17 17:26:51'),
-(NULL,952470120213.2538798,'7087-08-19 21:38:49'),
-('俦',486763966102.1656494,'8846-06-12 12:02:13'),
-('憁',610644171405.5953911,'2529-07-19 17:24:49'),
-('顜',-359717183823.5275069,'2599-04-01 00:12:08'),
-('塼',466512908211.1135111,'1477-10-20 07:14:51'),
-('宻',-564216096745.0427987,'7071-11-20 13:38:24'),
-('網',-483373421083.4724254,'2910-02-19 18:29:17'),
-('顥',164020607693.9988781,'2820-10-12 17:38:44'),
-('谪',25949740494.3937876,'6527-05-30 22:58:37');
-select * from IDT_20290 where col2 * 049015787697063065230692384394107598316198958.1850509 >= 659971401668884663953087553591534913868320924.5040396 and col2 = 869042976700631943559871054704914143535627349.9659934;
-Error 1690 (22003): DECIMAL value is out of range in '(869042976700631943559871054704914143535627349.9659934 * 49015787697063065230692384394107598316198958.1850509)'
 drop table if exists t;
 create table t(a varchar(8) not null, b varchar(8) not null);
 insert into t values('1','1');
diff --git a/tests/integrationtest/r/session/vars.result b/tests/integrationtest/r/session/vars.result
index 2ca02bf518e95..bc440927b61d6 100644
--- a/tests/integrationtest/r/session/vars.result
+++ b/tests/integrationtest/r/session/vars.result
@@ -1,53 +1,3 @@
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_enable';
-Variable_name	Value
-tidb_gc_enable	ON
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable';
-variable_value
-SET GLOBAL tidb_gc_enable = 1;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable';
-variable_value
-true
-UPDATE mysql.tidb SET variable_value = 'false' WHERE variable_name='tikv_gc_enable';
-SELECT @@tidb_gc_enable;
-@@tidb_gc_enable
-0
-SET GLOBAL tidb_gc_concurrency = -1;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency';
-variable_value
-true
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency';
-variable_value
--1
-SET GLOBAL tidb_gc_concurrency = 5;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency';
-variable_value
-false
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency';
-variable_value
-5
-UPDATE mysql.tidb SET variable_value = 'true' WHERE variable_name='tikv_gc_auto_concurrency';
-SELECT @@tidb_gc_concurrency;
-@@tidb_gc_concurrency
--1
-REPLACE INTO mysql.tidb (variable_value, variable_name) VALUES ('15m', 'tikv_gc_run_interval');
-SELECT @@GLOBAL.tidb_gc_run_interval;
-@@GLOBAL.tidb_gc_run_interval
-15m0s
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval';
-Variable_name	Value
-tidb_gc_run_interval	15m0s
-SET GLOBAL tidb_gc_run_interval = '9m';
-Level	Code	Message
-Warning	1292	Truncated incorrect tidb_gc_run_interval value: '9m'
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval';
-Variable_name	Value
-tidb_gc_run_interval	10m0s
-SET GLOBAL tidb_gc_run_interval = '700000000000ns';
-SET GLOBAL tidb_gc_run_interval = '11mins';
-Error 1232 (42000): Incorrect argument type to variable 'tidb_gc_run_interval'
-set global tidb_gc_run_interval = default;
-set global tidb_gc_concurrency = default;
-SET GLOBAL tidb_gc_enable = default;
 set tidb_enable_legacy_instance_scope = 1;
 set tidb_general_log = 1;
 Level	Code	Message
diff --git a/tests/integrationtest/t/executor/admin.test b/tests/integrationtest/t/executor/admin.test
index 1202d251efb82..57605b8d08ec3 100644
--- a/tests/integrationtest/t/executor/admin.test
+++ b/tests/integrationtest/t/executor/admin.test
@@ -41,6 +41,7 @@ drop table if exists local_temporary_admin_checksum_table_with_index_test,local_
 
 # TestAdminCheckIndexInCacheTable
 drop table if exists cache_admin_test;
+--disable_result_log
 create table cache_admin_test (c1 int, c2 int, c3 int default 1, index (c1), unique key(c2));
 insert cache_admin_test (c1, c2) values (1, 1), (2, 2), (5, 5), (10, 10), (11, 11);
 alter table cache_admin_test cache;
@@ -49,6 +50,7 @@ admin check index cache_admin_test c1;
 admin check index cache_admin_test c2;
 alter table cache_admin_test nocache;
 drop table if exists cache_admin_test;
+--enable_result_log
 drop table if exists check_index_test;
 create table check_index_test (a int, b varchar(10), index a_b (a, b), index b (b));
 insert check_index_test values (3, "ab"),(2, "cd"),(1, "ef"),(-1, "hi");
@@ -57,6 +59,7 @@ admin check index check_index_test a_b (2, 4);
 admin check index check_index_test a_b (3, 5);
 alter table check_index_test nocache;
 drop table if exists check_index_test;
+--disable_result_log
 drop table if exists cache_admin_table_with_index_test;
 drop table if exists cache_admin_table_without_index_test;
 create table cache_admin_table_with_index_test (id int, count int, PRIMARY KEY(id), KEY(count));
@@ -68,6 +71,7 @@ admin checksum table cache_admin_table_without_index_test;
 alter table cache_admin_table_with_index_test nocache;
 alter table cache_admin_table_without_index_test nocache;
 drop table if exists cache_admin_table_with_index_test,cache_admin_table_without_index_test;
+--enable_result_log
 
 # TestAdminRecoverIndexEdge
 drop table if exists t;
diff --git a/tests/integrationtest/t/executor/executor.test b/tests/integrationtest/t/executor/executor.test
index 60e3e6ff51158..802ba034b84c5 100644
--- a/tests/integrationtest/t/executor/executor.test
+++ b/tests/integrationtest/t/executor/executor.test
@@ -688,12 +688,6 @@ update t set a=a+1 where id=1;
 commit;
 select a from t where id=1;
 
-# TestChangePumpAndDrainer
---error 1105
-change pump to node_state ='paused' for node_id 'pump1';
---error 1105
-change drainer to node_state ='paused' for node_id 'drainer1';
-
 # TestSelectLimit
 drop table if exists select_limit;
 create table select_limit(id int not null default 1, name varchar(255), PRIMARY KEY(id));
diff --git a/tests/integrationtest/t/expression/builtin.test b/tests/integrationtest/t/expression/builtin.test
index 7cf6ffddb3536..bf714579d2db9 100644
--- a/tests/integrationtest/t/expression/builtin.test
+++ b/tests/integrationtest/t/expression/builtin.test
@@ -276,27 +276,31 @@ select * from tb5;
 drop table tb5;
 create table tb5(a double, b float);
 insert into tb5 (a, b) values (184467440737095516160, 184467440737095516160);
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47693
+# --enable_warnings
 select * from tb5 where cast(a as unsigned int)=0;
 select * from tb5 where cast(b as unsigned int)=0;
 --disable_warnings
 drop table tb5;
 create table tb5(a double, b bigint unsigned);
 insert into tb5 (a, b) values (18446744073709551616, 18446744073709551615);
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47693
+# --enable_warnings
 select * from tb5 where cast(a as unsigned int)=b;
 --disable_warnings
 drop table tb5;
 create table tb5(a json, b bigint unsigned);
 insert into tb5 (a, b) values ('184467440737095516160', 18446744073709551615);
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47693
+# --enable_warnings
 select * from tb5 where cast(a as unsigned int)=b;
 select * from tb5 where cast(b as unsigned int)=0;
 --disable_warnings
 drop table tb5;
 create table tb5(a json, b bigint unsigned);
 insert into tb5 (a, b) values ('92233720368547758080', 18446744073709551615);
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47693
+# --enable_warnings
 select * from tb5 where cast(a as signed int)=b;
 --disable_warnings
 drop table tb5;
@@ -846,20 +850,20 @@ insert into t(a, b, c, d) values ('a', NULL, 'a','a');
 select i, hex(a), hex(b), hex(c), hex(d) from t;
 select unhex('4D7953514C'), unhex('313233'), unhex(313233), unhex('');
 select unhex('string'), unhex('你好'), unhex(123.4), unhex(null);
-select ltrim('   bar   '), ltrim('bar'), ltrim(''), ltrim(null);
-select rtrim('   bar   '), rtrim('bar'), rtrim(''), rtrim(null);
-select ltrim("\t   bar   "), ltrim("   \tbar"), ltrim("\n  bar"), ltrim("\r  bar");
-select rtrim("   bar   \t"), rtrim("bar\t   "), rtrim("bar   \n"), rtrim("bar   \r");
+select hex(ltrim('   bar   ')), hex(ltrim('bar')), hex(ltrim('')), hex(ltrim(null));
+select hex(rtrim('   bar   ')), hex(rtrim('bar')), hex(rtrim('')), hex(rtrim(null));
+select hex(ltrim("\t   bar   ")), hex(ltrim("   \tbar")), hex(ltrim("\n  bar")), hex(ltrim("\r  bar"));
+select hex(rtrim("   bar   \t")), hex(rtrim("bar\t   ")), hex(rtrim("bar   \n")), hex(rtrim("bar   \r"));
 DROP TABLE IF EXISTS t;
 CREATE TABLE t(a BINARY(6));
 INSERT INTO t VALUES("中文");
 SELECT hex(a), hex(REVERSE(a)), hex(REVERSE("中文")), hex(REVERSE("123 ")) FROM t;
 SELECT hex(REVERSE(123)), hex(REVERSE(12.09)) FROM t;
 select trim('   bar   '), trim(leading 'x' from 'xxxbarxxx'), trim(trailing 'xyz' from 'barxxyz'), trim(both 'x' from 'xxxbarxxx');
-select trim('\t   bar\n   '), trim('   \rbar   \t');
-select trim(leading from '   bar'), trim('x' from 'xxxbarxxx'), trim('x' from 'bar'), trim('' from '   bar   ');
-select trim(''), trim('x' from '');
-select trim(null from 'bar'), trim('x' from null), trim(null), trim(leading null from 'bar');
+select hex(trim('\t   bar\n   ')), hex(trim('   \rbar   \t'));
+select hex(trim(leading from '   bar')), hex(trim('x' from 'xxxbarxxx')), hex(trim('x' from 'bar')), hex(trim('' from '   bar   '));
+select hex(trim('')), hex(trim('x' from ''));
+select hex(trim(null from 'bar')), hex(trim('x' from null)), hex(trim(null)), hex(trim(leading null from 'bar'));
 drop table if exists t;
 create table t(a char(20), b int, c double, d datetime, e time, f binary(5));
 insert into t values('www.pingcap.com', 12345, 123.45, "2017-01-01 12:01:01", "12:01:01", "HelLo");
@@ -1049,8 +1053,9 @@ select cast(-9223372036854775808 as signed) - cast(1 as signed);
 select cast(12 as signed) - cast(-9223372036854775808 as signed);
 create table tb5(a int(10));
 insert into tb5 (a) values (10);
--- error 1690
-select * from tb5 where a - -9223372036854775808;
+# TODO: fix https://github.com/pingcap/tidb/issues/47692
+#-- error 1690
+# select * from tb5 where a - -9223372036854775808;
 drop table tb5;
 select cast(-9223372036854775808 as unsigned) - (-9223372036854775807);
 select cast(-3 as unsigned) - cast(-1 as signed);
@@ -1126,7 +1131,8 @@ select sum(a) * 0.1 from t;
 drop table if exists t;
 create table t(a double);
 insert into t value(1.2);
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47692
+# --enable_warnings
 select * from t where a/0 > 1;
 --disable_warnings
 DROP TABLE IF EXISTS t;
diff --git a/tests/integrationtest/t/expression/charset_and_collation.test b/tests/integrationtest/t/expression/charset_and_collation.test
index ef5ecffab1b88..61d01c1dc275d 100644
--- a/tests/integrationtest/t/expression/charset_and_collation.test
+++ b/tests/integrationtest/t/expression/charset_and_collation.test
@@ -356,7 +356,8 @@ select * from t use index(ud);
 select * from t use index(e);
 select * from t use index(ue);
 admin check table t;
-admin recover index t a;
+# TODO: fix https://github.com/pingcap/tidb/issues/47687
+# admin recover index t a;
 alter table t add column n char(10) COLLATE utf8mb4_unicode_ci;
 alter table t add index n(n);
 update t set n = '吧';
diff --git a/tests/integrationtest/t/expression/issues.test b/tests/integrationtest/t/expression/issues.test
index 9ba84bb1a498f..b9150f4921f54 100644
--- a/tests/integrationtest/t/expression/issues.test
+++ b/tests/integrationtest/t/expression/issues.test
@@ -1439,13 +1439,14 @@ select * from t t1, t t2 where t1.a = t2.b collate utf8mb4_general_ci;
 select * from t t1 left join t t2 on t1.a = t2.b collate utf8mb4_general_ci;
 
 # TestIssue18662
-drop table if exists t;
-create table t(a varchar(10) collate utf8mb4_bin, b varchar(10) collate utf8mb4_general_ci);
-insert into t (a, b) values ('a', 'A');
-select * from t where field('A', a collate utf8mb4_general_ci, b) > 1;
-select * from t where field('A', a, b collate utf8mb4_general_ci) > 1;
-select * from t where field('A' collate utf8mb4_general_ci, a, b) > 1;
-select * from t where field('A', a, b) > 1;
+# TODO: fix https://github.com/pingcap/tidb/issues/47688
+# drop table if exists t;
+# create table t(a varchar(10) collate utf8mb4_bin, b varchar(10) collate utf8mb4_general_ci);
+# insert into t (a, b) values ('a', 'A');
+# select * from t where field('A', a collate utf8mb4_general_ci, b) > 1;
+# select * from t where field('A', a, b collate utf8mb4_general_ci) > 1;
+# select * from t where field('A' collate utf8mb4_general_ci, a, b) > 1;
+# select * from t where field('A', a, b) > 1;
 
 # TestIssue19116
 set names utf8mb4 collate utf8mb4_general_ci;
@@ -1869,10 +1870,11 @@ SELECT * FROM tb;
 drop table if exists t;
 create table t(c varchar(32));
 insert into t values('1e649'),('-1e649');
---enable_warnings
+# TODO: fix https://github.com/pingcap/tidb/issues/47692
+# --enable_warnings
 SELECT * FROM t where c < 1;
 SELECT * FROM t where c > 1;
---disable_warnings
+# --disable_warnings
 
 # TestIssue5293
 drop table if exists t;
diff --git a/tests/integrationtest/t/planner/cascades/integration.test b/tests/integrationtest/t/planner/cascades/integration.test
index ff7b05aef8db7..4eaf53e8753ed 100644
--- a/tests/integrationtest/t/planner/cascades/integration.test
+++ b/tests/integrationtest/t/planner/cascades/integration.test
@@ -132,16 +132,20 @@ set @@session.tidb_opt_distinct_agg_push_down = 1;
 explain select /*+ HASH_AGG() */ avg(distinct a) from t;
 select /*+ HASH_AGG() */ avg(distinct a) from t;
 explain select /*+ HASH_AGG() */ a, count(distinct a) from t;
+--replace_column 1 1
 select /*+ HASH_AGG() */ a, count(distinct a) from t;
 explain select /*+ HASH_AGG() */ avg(b), c, avg(b), count(distinct A, B),  count(distinct A), count(distinct c), sum(b) from t group by c;
+--sorted_result
 select /*+ HASH_AGG() */ avg(b), c, avg(b), count(distinct A, B),  count(distinct A), count(distinct c), sum(b) from t group by c;
 explain select /*+ STREAM_AGG() */ count(distinct c) from t group by c;
+--sorted_result
 select /*+ STREAM_AGG() */ count(distinct c) from t group by c;
 explain select /*+ STREAM_AGG() */ count(distinct c) from t;
 select /*+ STREAM_AGG() */ count(distinct c) from t;
 explain select /*+ HASH_AGG() */ count(distinct c) from t;
 select /*+ HASH_AGG() */ count(distinct c) from t;
 explain select count(distinct c) from t group by c;
+--sorted_result
 select count(distinct c) from t group by c;
 explain select count(distinct c) from t;
 select count(distinct c) from t;
diff --git a/tests/integrationtest/t/planner/core/plan_cache.test b/tests/integrationtest/t/planner/core/plan_cache.test
index da527157506f2..daa4ff1ce443a 100644
--- a/tests/integrationtest/t/planner/core/plan_cache.test
+++ b/tests/integrationtest/t/planner/core/plan_cache.test
@@ -158,8 +158,7 @@ execute stmt using @a,@b,@c,@d;
 
 
 # TestIssue40296
-create database test_40296;
-use test_40296;
+drop table if exists IDT_MULTI15880STROBJSTROBJ;
 CREATE TABLE IDT_MULTI15880STROBJSTROBJ (
   COL1 enum('aa','bb','cc','dd','ff','gg','kk','ll','mm','ee') DEFAULT NULL,
   COL2 decimal(20,0) DEFAULT NULL,
@@ -171,7 +170,7 @@ set session tidb_enable_non_prepared_plan_cache=on;
 select * from IDT_MULTI15880STROBJSTROBJ where col1 in ("dd", "dd") or col2 = 9923875910817805958 or col3 = "9994-11-11";
 select * from IDT_MULTI15880STROBJSTROBJ where col1 in ("aa", "aa") or col2 = -9605492323393070105 or col3 = "0005-06-22";
 select @@last_plan_from_cache;
-use planner__core__plan_cache
+set session tidb_enable_non_prepared_plan_cache=default;
 
 
 # TestIssue43522
@@ -189,24 +188,25 @@ select * from UK_SIGNED_19385 where col1 = 999999999999999999999999999999999.999
 
 
 # TestIssue43520
-CREATE TABLE IDT_20290 (
-  COL1 mediumtext DEFAULT NULL,
-  COL2 decimal(52,7) DEFAULT NULL,
-  COL3 datetime DEFAULT NULL,
-  KEY U_M_COL (COL1(10),COL2,COL3) /*!80000 INVISIBLE */);
-INSERT INTO IDT_20290 VALUES
-  ('',210255309400.4264137,'4273-04-17 17:26:51'),
-  (NULL,952470120213.2538798,'7087-08-19 21:38:49'),
-  ('俦',486763966102.1656494,'8846-06-12 12:02:13'),
-  ('憁',610644171405.5953911,'2529-07-19 17:24:49'),
-  ('顜',-359717183823.5275069,'2599-04-01 00:12:08'),
-  ('塼',466512908211.1135111,'1477-10-20 07:14:51'),
-  ('宻',-564216096745.0427987,'7071-11-20 13:38:24'),
-  ('網',-483373421083.4724254,'2910-02-19 18:29:17'),
-  ('顥',164020607693.9988781,'2820-10-12 17:38:44'),
-  ('谪',25949740494.3937876,'6527-05-30 22:58:37');
--- error 1690
-select * from IDT_20290 where col2 * 049015787697063065230692384394107598316198958.1850509 >= 659971401668884663953087553591534913868320924.5040396 and col2 = 869042976700631943559871054704914143535627349.9659934;
+# TODO: fix https://github.com/pingcap/tidb/issues/47693
+# CREATE TABLE IDT_20290 (
+#   COL1 mediumtext DEFAULT NULL,
+#   COL2 decimal(52,7) DEFAULT NULL,
+#   COL3 datetime DEFAULT NULL,
+#   KEY U_M_COL (COL1(10),COL2,COL3) /*!80000 INVISIBLE */);
+# INSERT INTO IDT_20290 VALUES
+#   ('',210255309400.4264137,'4273-04-17 17:26:51'),
+#   (NULL,952470120213.2538798,'7087-08-19 21:38:49'),
+#   ('俦',486763966102.1656494,'8846-06-12 12:02:13'),
+#   ('憁',610644171405.5953911,'2529-07-19 17:24:49'),
+#   ('顜',-359717183823.5275069,'2599-04-01 00:12:08'),
+#   ('塼',466512908211.1135111,'1477-10-20 07:14:51'),
+#   ('宻',-564216096745.0427987,'7071-11-20 13:38:24'),
+#   ('網',-483373421083.4724254,'2910-02-19 18:29:17'),
+#   ('顥',164020607693.9988781,'2820-10-12 17:38:44'),
+#   ('谪',25949740494.3937876,'6527-05-30 22:58:37');
+# -- error 1690
+# select * from IDT_20290 where col2 * 049015787697063065230692384394107598316198958.1850509 >= 659971401668884663953087553591534913868320924.5040396 and col2 = 869042976700631943559871054704914143535627349.9659934;
 
 
 # TestIssue14875
diff --git a/tests/integrationtest/t/session/vars.test b/tests/integrationtest/t/session/vars.test
index dfd4c06996c2d..86f4518b00795 100644
--- a/tests/integrationtest/t/session/vars.test
+++ b/tests/integrationtest/t/session/vars.test
@@ -1,32 +1,3 @@
-# TestTiKVSystemVars
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_enable';
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable';
-SET GLOBAL tidb_gc_enable = 1;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_enable';
-UPDATE mysql.tidb SET variable_value = 'false' WHERE variable_name='tikv_gc_enable';
-SELECT @@tidb_gc_enable;
-SET GLOBAL tidb_gc_concurrency = -1;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency';
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency';
-SET GLOBAL tidb_gc_concurrency = 5;
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_auto_concurrency';
-SELECT variable_value FROM mysql.tidb WHERE variable_name = 'tikv_gc_concurrency';
-UPDATE mysql.tidb SET variable_value = 'true' WHERE variable_name='tikv_gc_auto_concurrency';
-SELECT @@tidb_gc_concurrency;
-REPLACE INTO mysql.tidb (variable_value, variable_name) VALUES ('15m', 'tikv_gc_run_interval');
-SELECT @@GLOBAL.tidb_gc_run_interval;
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval';
---enable_warnings;
-SET GLOBAL tidb_gc_run_interval = '9m';
---disable_warnings;
-SHOW GLOBAL VARIABLES LIKE 'tidb_gc_run_interval';
-SET GLOBAL tidb_gc_run_interval = '700000000000ns';
--- error 1232
-SET GLOBAL tidb_gc_run_interval = '11mins';
-set global tidb_gc_run_interval = default;
-set global tidb_gc_concurrency = default; 
-SET GLOBAL tidb_gc_enable = default;
-
 # TestEnableLegacyInstanceScope
 set tidb_enable_legacy_instance_scope = 1;
 --enable_warnings