diff --git a/dm/step_by_step_contribute.md b/dm/step_by_step_contribute.md
index f113510fd00..ef831e3f73f 100644
--- a/dm/step_by_step_contribute.md
+++ b/dm/step_by_step_contribute.md
@@ -203,7 +203,7 @@ Edit some code on the `new-branch-name` branch and save your changes to fix the
 
     ```sh
     docker run --rm --name mysql-3306 -p 3306:3306 -e MYSQL_ROOT_PASSWORD=123456 mysql:5.7.22 --log-bin=mysql-bin --port=3306 --bind-address=0.0.0.0 --binlog-format=ROW --server-id=1 --gtid_mode=ON --enforce-gtid-consistency=true > mysql.3306.log 2>&1 &
-    docker run --rm --name mysql-3307 -p 3307:3307 -e MYSQL_ROOT_PASSWORD=123456 mysql:5.7.22 --log-bin=mysql-bin --port=3307 --bind-address=0.0.0.0 --binlog-format=ROW --server-id=1 --gtid_mode=ON --enforce-gtid-consistency=true > mysql.3307.log 2>&1 &
+    docker run --rm --name mysql-3307 -p 3307:3307 -e MYSQL_ROOT_PASSWORD=123456 mysql:8.0.21 --log-bin=mysql-bin --port=3307 --bind-address=0.0.0.0 --binlog-format=ROW --server-id=1 --gtid_mode=ON --enforce-gtid-consistency=true > mysql.3307.log 2>&1 &
     ```
 
 3. Run integration test
diff --git a/dm/tests/_utils/check_sync_diff b/dm/tests/_utils/check_sync_diff
index e4ed59f3245..27d85485768 100755
--- a/dm/tests/_utils/check_sync_diff
+++ b/dm/tests/_utils/check_sync_diff
@@ -14,8 +14,8 @@ fi
 
 PWD=$(pwd)
 binary=$PWD/bin/sync_diff_inspector
-LOG=$workdir/sync_diff_inspector.log
 OUTPUT_DIR=/tmp/ticdc_dm_test/output/
+STDOUT=$workdir/sync_diff_stdout.log
 
 mkdir -p /tmp/ticdc_dm_test
 
@@ -23,7 +23,7 @@ cd $workdir
 i=0
 while [ $i -lt $check_time ]; do
 	rm -rf $OUTPUT_DIR
-	$binary --config=$conf >>$LOG 2>&1
+	$binary --config=$conf -L=debug >$STDOUT 2>&1
 	ret=$?
 	if [ "$ret" == 0 ]; then
 		echo "check diff successfully"
@@ -41,8 +41,9 @@ if [ $i -ge $check_time ]; then
 	echo "check diff failed at last"
 	if [[ $4 != "fail" ]]; then
 		# show \n and other blanks
-		cat $LOG
-		printf "\n"
+		printf "$STDOUT\n"
+		cat $STDOUT
+		printf "$OUTPUT_DIR/sync_diff.log\n"
 		cat $OUTPUT_DIR/sync_diff.log
 		printf "\n"
 		exit 1
diff --git a/dm/tests/_utils/run_dm_ctl_with_tls_and_retry b/dm/tests/_utils/run_dm_ctl_with_tls_and_retry
index de2f2ee257d..cdc049defce 100755
--- a/dm/tests/_utils/run_dm_ctl_with_tls_and_retry
+++ b/dm/tests/_utils/run_dm_ctl_with_tls_and_retry
@@ -45,6 +45,9 @@ for ((k = 0; k < 10; k++)); do
 
 	sleep 2
 done
+
+exit 1
+
 # gocovmerge doesn't support merge profiles with different modes, however atomic
 # mode and count mode have the same profile format, so we need to unify cover
 # mode before running gocovmerge. As coverage file is not generated synchronously,
diff --git a/dm/tests/_utils/run_tidb_server b/dm/tests/_utils/run_tidb_server
index 062a6e0c4d7..20f82605ff6 100755
--- a/dm/tests/_utils/run_tidb_server
+++ b/dm/tests/_utils/run_tidb_server
@@ -5,11 +5,24 @@
 
 set -eu
 
+tmp_config="/tmp/dm_test/tidb.toml"
+
 PORT=$1
 PASSWORD=$2
 CONFIG=""
+
 if [ "$#" -ge 3 ]; then
-	CONFIG=$3
+	cat $3 >$tmp_config
+else
+	# turn on collation framework https://docs.pingcap.com/tidb/stable/character-set-and-collation#new-framework-for-collations
+	rm $tmp_config || true
+	cat >$tmp_config <<EOF
+new_collations_enabled_on_first_bootstrap = true
+
+[experimental]
+enable-new-charset = true
+
+EOF
 fi
 
 TEST_DIR=/tmp/dm_test
@@ -17,8 +30,7 @@ TEST_DIR=/tmp/dm_test
 echo "Starting TiDB on port ${PORT}"
 bin/tidb-server \
 	-P ${PORT} \
-	--store mocktikv \
-	--config "$CONFIG" \
+	--config "$tmp_config" \
 	--log-file "$TEST_DIR/tidb.log" &
 
 echo "Verifying TiDB is started..."
diff --git a/dm/tests/online_ddl/data/gho.db1.prepare.sql b/dm/tests/online_ddl/data/gho.db1.prepare.sql
index 15522a0a100..6c67c982868 100644
--- a/dm/tests/online_ddl/data/gho.db1.prepare.sql
+++ b/dm/tests/online_ddl/data/gho.db1.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `online_ddl`;
 create database `online_ddl`;
 use `online_ddl`;
-create table gho_t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table gho_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table gho_t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table gho_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into gho_t1 (uid, name) values (10001, 'Gabriel García Márquez'), (10002, 'Cien años de soledad');
 insert into gho_t2 (uid, name) values (20001, 'José Arcadio Buendía'), (20002, 'Úrsula Iguarán'), (20003, 'José Arcadio');
diff --git a/dm/tests/online_ddl/data/gho.db2.prepare.sql b/dm/tests/online_ddl/data/gho.db2.prepare.sql
index 7e544404e02..b2d67976b92 100644
--- a/dm/tests/online_ddl/data/gho.db2.prepare.sql
+++ b/dm/tests/online_ddl/data/gho.db2.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `online_ddl`;
 create database `online_ddl`;
 use `online_ddl`;
-create table gho_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table gho_t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table gho_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table gho_t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into gho_t2 (uid, name, info) values (40000, 'Remedios Moscote', '{}'), (40001, 'Amaranta', '{"age": 0}');
 insert into gho_t3 (uid, name, info) values (30001, 'Aureliano José', '{}'), (30002, 'Santa Sofía de la Piedad', '{}'), (30003, '17 Aurelianos', NULL);
diff --git a/dm/tests/online_ddl/data/pt.db1.prepare.sql b/dm/tests/online_ddl/data/pt.db1.prepare.sql
index a8e0f343629..845572e35f9 100644
--- a/dm/tests/online_ddl/data/pt.db1.prepare.sql
+++ b/dm/tests/online_ddl/data/pt.db1.prepare.sql
@@ -1,5 +1,5 @@
 use `online_ddl`;
-create table pt_t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table pt_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table pt_t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table pt_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into pt_t1 (uid, name) values (10001, 'Gabriel García Márquez'), (10002, 'Cien años de soledad');
 insert into pt_t2 (uid, name) values (20001, 'José Arcadio Buendía'), (20002, 'Úrsula Iguarán'), (20003, 'José Arcadio');
diff --git a/dm/tests/online_ddl/data/pt.db2.prepare.sql b/dm/tests/online_ddl/data/pt.db2.prepare.sql
index 1c58118768d..4e76366f6c7 100644
--- a/dm/tests/online_ddl/data/pt.db2.prepare.sql
+++ b/dm/tests/online_ddl/data/pt.db2.prepare.sql
@@ -1,5 +1,5 @@
 use `online_ddl`;
-create table pt_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table pt_t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table pt_t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table pt_t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into pt_t2 (uid, name, info) values (40000, 'Remedios Moscote', '{}'), (40001, 'Amaranta', '{"age": 0}');
 insert into pt_t3 (uid, name, info) values (30001, 'Aureliano José', '{}'), (30002, 'Santa Sofía de la Piedad', '{}'), (30003, '17 Aurelianos', NULL);
diff --git a/dm/tests/safe_mode/data/db2.prepare.sql b/dm/tests/safe_mode/data/db2.prepare.sql
index 05e1152bfa3..0a3f75072a0 100644
--- a/dm/tests/safe_mode/data/db2.prepare.sql
+++ b/dm/tests/safe_mode/data/db2.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `safe_mode_test`;
 create database `safe_mode_test`;
 use `safe_mode_test`;
-create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT = 200;
-create table t3 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT = 300;
+create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) AUTO_INCREMENT = 200;
+create table t3 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) AUTO_INCREMENT = 300;
 insert into t2 (uid, name) values (40000, 'Remedios Moscote'), (40001, 'Amaranta');
 insert into t3 (uid, name) values (30001, 'Aureliano José'), (30002, 'Santa Sofía de la Piedad'), (30003, '17 Aurelianos');
diff --git a/dm/tests/sequence_safe_mode/data/db1.prepare.sql b/dm/tests/sequence_safe_mode/data/db1.prepare.sql
index cd99922c775..f3525a26f2b 100644
--- a/dm/tests/sequence_safe_mode/data/db1.prepare.sql
+++ b/dm/tests/sequence_safe_mode/data/db1.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `sequence_safe_mode_test`;
 create database `sequence_safe_mode_test`;
 use `sequence_safe_mode_test`;
-create table t1 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t1 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t1 (uid, name) values (10001, 'Gabriel García Márquez'), (10002, 'Cien años de soledad');
 insert into t2 (uid, name) values (20001, 'José Arcadio Buendía'), (20002, 'Úrsula Iguarán'), (20003, 'José Arcadio');
diff --git a/dm/tests/sequence_safe_mode/data/db2.prepare.sql b/dm/tests/sequence_safe_mode/data/db2.prepare.sql
index fedddf1dfab..53cce1b3b92 100644
--- a/dm/tests/sequence_safe_mode/data/db2.prepare.sql
+++ b/dm/tests/sequence_safe_mode/data/db2.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `sequence_safe_mode_test`;
 create database `sequence_safe_mode_test`;
 use `sequence_safe_mode_test`;
-create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t3 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t2 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t3 (id bigint auto_increment, uid int, name varchar(80), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t2 (uid, name) values (40000, 'Remedios Moscote'), (40001, 'Amaranta');
 insert into t3 (uid, name) values (30001, 'Aureliano José'), (30002, 'Santa Sofía de la Piedad'), (30003, '17 Aurelianos');
diff --git a/dm/tests/sequence_sharding/data/db1.prepare.sql b/dm/tests/sequence_sharding/data/db1.prepare.sql
index 21b580481bd..98e635d6b46 100644
--- a/dm/tests/sequence_sharding/data/db1.prepare.sql
+++ b/dm/tests/sequence_sharding/data/db1.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `sharding_seq`;
 create database `sharding_seq`;
 use `sharding_seq`;
-create table t1 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t1 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t1 (uid,name) values (100001,'igvApUx'),(100002,'qUyrcOBkwDK');
 insert into t2 (uid,name) values (200001,'EycletJHetWHMfH'),(200002,'ytkIaCOwXnWmy'),(200003,'MWQeWw""''rNmtGxzGp');
diff --git a/dm/tests/sequence_sharding/data/db2.prepare.sql b/dm/tests/sequence_sharding/data/db2.prepare.sql
index 23223d148cf..b06fe6e6b2b 100644
--- a/dm/tests/sequence_sharding/data/db2.prepare.sql
+++ b/dm/tests/sequence_sharding/data/db2.prepare.sql
@@ -1,9 +1,9 @@
 drop database if exists `sharding_seq`;
 create database `sharding_seq`;
 use `sharding_seq`;
-create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t3 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t4 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t3 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t4 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t2 (uid,name) values (300001,'io'),(300002,'xOKvsDsofmAzEF');
 insert into t3 (uid,name) values (400001,'eXcRSo'),(400002,'QOP'),(400003,'DUotcCayM');
 insert into t4 (uid,name) values (500001,'`id` = 15'),(500002,'942032497'),(500003,'UrhcHUbwsDMZrvJxM');
diff --git a/dm/tests/sequence_sharding_removemeta/data/db1.prepare.sql b/dm/tests/sequence_sharding_removemeta/data/db1.prepare.sql
index 21b580481bd..98e635d6b46 100644
--- a/dm/tests/sequence_sharding_removemeta/data/db1.prepare.sql
+++ b/dm/tests/sequence_sharding_removemeta/data/db1.prepare.sql
@@ -1,7 +1,7 @@
 drop database if exists `sharding_seq`;
 create database `sharding_seq`;
 use `sharding_seq`;
-create table t1 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t1 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t1 (uid,name) values (100001,'igvApUx'),(100002,'qUyrcOBkwDK');
 insert into t2 (uid,name) values (200001,'EycletJHetWHMfH'),(200002,'ytkIaCOwXnWmy'),(200003,'MWQeWw""''rNmtGxzGp');
diff --git a/dm/tests/sequence_sharding_removemeta/data/db2.prepare.sql b/dm/tests/sequence_sharding_removemeta/data/db2.prepare.sql
index 23223d148cf..b06fe6e6b2b 100644
--- a/dm/tests/sequence_sharding_removemeta/data/db2.prepare.sql
+++ b/dm/tests/sequence_sharding_removemeta/data/db2.prepare.sql
@@ -1,9 +1,9 @@
 drop database if exists `sharding_seq`;
 create database `sharding_seq`;
 use `sharding_seq`;
-create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t3 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t4 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t2 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t3 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+create table t4 (id bigint auto_increment,uid int,name varchar(20),primary key (`id`),unique key(`uid`)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 insert into t2 (uid,name) values (300001,'io'),(300002,'xOKvsDsofmAzEF');
 insert into t3 (uid,name) values (400001,'eXcRSo'),(400002,'QOP'),(400003,'DUotcCayM');
 insert into t4 (uid,name) values (500001,'`id` = 15'),(500002,'942032497'),(500003,'UrhcHUbwsDMZrvJxM');
diff --git a/dm/tests/shardddl1/run.sh b/dm/tests/shardddl1/run.sh
index f448449434d..d754be0f5c5 100644
--- a/dm/tests/shardddl1/run.sh
+++ b/dm/tests/shardddl1/run.sh
@@ -153,7 +153,7 @@ function DM_RENAME_COLUMN_OPTIMISTIC_CASE() {
 
 	# third, set schema to be same with upstream
 	# TODO: support set schema automatically base on upstream schema
-	echo 'CREATE TABLE `tb1` ( `c` int NOT NULL, `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`c`)) ENGINE=InnoDB DEFAULT CHARSET=latin1' >${WORK_DIR}/schema1.sql
+	echo 'CREATE TABLE `tb1` ( `c` int NOT NULL, `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`c`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin' >${WORK_DIR}/schema1.sql
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"binlog-schema update -s mysql-replica-01 test ${shardddl1} ${tb1} ${WORK_DIR}/schema1.sql --flush --sync" \
 		"\"result\": true" 2
@@ -175,7 +175,7 @@ function DM_RENAME_COLUMN_OPTIMISTIC_CASE() {
 	# Actually it should be tb2(a,b), dml is {a: 9, b: 'iii'}
 	# Now we set it to tb2(c,b), dml become {c: 9, b: 'iii'}
 	# This may only work for a "rename ddl"
-	echo 'CREATE TABLE `tb2` ( `c` int NOT NULL, `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`c`)) ENGINE=InnoDB DEFAULT CHARSET=latin1' >${WORK_DIR}/schema2.sql
+	echo 'CREATE TABLE `tb2` ( `c` int NOT NULL, `b` varchar(10) DEFAULT NULL, PRIMARY KEY (`c`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin' >${WORK_DIR}/schema2.sql
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"binlog-schema update -s mysql-replica-02 test ${shardddl1} ${tb2} ${WORK_DIR}/schema2.sql --flush --sync" \
 		"\"result\": true" 2
@@ -228,9 +228,9 @@ function DM_RENAME_COLUMN_OPTIMISTIC_CASE() {
 # maybe also work for some other unsupported ddls in optimistic mode
 function DM_RENAME_COLUMN_OPTIMISTIC() {
 	run_case RENAME_COLUMN_OPTIMISTIC "double-source-optimistic" \
-		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1;\"" \
+		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b varchar(10)) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;\"" \
 		"clean_table" "optimistic"
 }
 
diff --git a/dm/tests/shardddl2/run.sh b/dm/tests/shardddl2/run.sh
index 4063bb93131..7c6cb091dce 100644
--- a/dm/tests/shardddl2/run.sh
+++ b/dm/tests/shardddl2/run.sh
@@ -411,8 +411,8 @@ function DM_RECOVER_LOCK_CASE() {
 
 function DM_RECOVER_LOCK() {
 	run_case RECOVER_LOCK "double-source-optimistic" \
-		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int) DEFAULT CHARSET=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b int) DEFAULT CHARSET=latin1;\"" \
+		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b int) DEFAULT CHARSET=latin1 COLLATE=latin1_bin;\"" \
 		"clean_table" "optimistic"
 }
 
diff --git a/dm/tests/shardddl3/conf/tidb-alter-pk-config.toml b/dm/tests/shardddl3/conf/tidb-alter-pk-config.toml
deleted file mode 100644
index a1257473a3a..00000000000
--- a/dm/tests/shardddl3/conf/tidb-alter-pk-config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-# TiDB Configuration.
-
-# alter-primary-key is used to control alter primary key feature. Default is false, indicate the alter primary key feature is disabled.
-# If it is true, we can add the primary key by "alter table". However, if a table already exists before the switch is turned true and the data type of its primary key column is an integer,
-# the primary key cannot be dropped.
-alter-primary-key = true
diff --git a/dm/tests/shardddl3/run.sh b/dm/tests/shardddl3/run.sh
index f61906c6795..644db4d5a71 100644
--- a/dm/tests/shardddl3/run.sh
+++ b/dm/tests/shardddl3/run.sh
@@ -99,6 +99,7 @@ function DM_077_CASE() {
 }
 
 function DM_077() {
+	run_sql_tidb "create database if not exists ${shardddl};"
 	run_sql_tidb "create table ${shardddl}.${tb} (id int, primary key(id) clustered);"
 	run_case 077 "single-source-pessimistic" "run_sql_source1 \"create table ${shardddl1}.${tb1} (id int primary key);\"" "clean_table" ""
 	run_sql_tidb "create table ${shardddl}.${tb} (id int, primary key(id) clustered);"
@@ -114,15 +115,8 @@ function DM_078_CASE() {
 }
 
 function DM_078() {
-	# start a TiDB alter-pk
-	pkill -hup tidb-server 2>/dev/null || true
-	wait_process_exit tidb-server
-	run_tidb_server 4000 $TIDB_PASSWORD $cur/conf/tidb-alter-pk-config.toml
-
 	run_case 078 "single-source-pessimistic" "run_sql_source1 \"create table ${shardddl1}.${tb1} (id int unique, a int, b varchar(10));\"" "clean_table" ""
 	run_case 078 "single-source-optimistic" "run_sql_source1 \"create table ${shardddl1}.${tb1} (id int unique, a int, b varchar(10));\"" "clean_table" ""
-
-	# don't revert tidb until DM_079
 }
 
 function DM_079_CASE() {
@@ -130,17 +124,14 @@ function DM_079_CASE() {
 	run_sql_source1 "alter table ${shardddl1}.${tb1} drop primary key;"
 	run_sql_source1 "insert into ${shardddl1}.${tb1} values (0, 'wer'), (0, NULL);"
 
-	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
+	run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \
+		"query-status test" \
+		"Unsupported drop primary key when the table's pkIsHandle is true" 1
 }
 
 function DM_079() {
 	run_case 079 "single-source-pessimistic" "run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10));\"" "clean_table" ""
 	run_case 079 "single-source-optimistic" "run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b varchar(10));\"" "clean_table" ""
-
-	# revert tidb
-	pkill -hup tidb-server 2>/dev/null || true
-	wait_process_exit tidb-server
-	run_tidb_server 4000 $TIDB_PASSWORD
 }
 
 function DM_080_CASE() {
diff --git a/dm/tests/shardddl3_1/run.sh b/dm/tests/shardddl3_1/run.sh
index 8f33a57173f..b9bce6cac03 100644
--- a/dm/tests/shardddl3_1/run.sh
+++ b/dm/tests/shardddl3_1/run.sh
@@ -535,7 +535,7 @@ function DM_117_CASE {
 		"add column b that wasn't fully dropped in downstream" 1
 
 	# try to fix data
-	echo 'create table tb1(a int primary key, b int, c int) engine=innodb default charset=latin1;' >${WORK_DIR}/schema.sql
+	echo 'create table tb1(a int primary key, b int, c int) engine=innodb default charset=latin1 collate=latin1_bin;' >${WORK_DIR}/schema.sql
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"binlog-schema update test ${shardddl1} ${tb1} ${WORK_DIR}/schema.sql -s mysql-replica-01" \
 		"\"result\": true" 2
@@ -553,9 +553,9 @@ function DM_117_CASE {
 # Drop multiple fields and rollback.
 function DM_117 {
 	run_case 117 "double-source-optimistic" \
-		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int) engine=innodb default charset=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int) engine=innodb default charset=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b int, c int) engine=innodb default charset=latin1;\"" \
+		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, b int, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"" \
 		"clean_table" "optimistic"
 }
 
diff --git a/dm/tests/shardddl4_1/run.sh b/dm/tests/shardddl4_1/run.sh
index 0351dfc4e83..f7b435e260b 100644
--- a/dm/tests/shardddl4_1/run.sh
+++ b/dm/tests/shardddl4_1/run.sh
@@ -566,7 +566,7 @@ function DM_147_CASE {
 		"add column c that wasn't fully dropped in downstream" 1
 
 	# try to fix data
-	echo 'create table tbl(a int primary key, b int, c int) engine=innodb default charset=latin1;' >${WORK_DIR}/schema.sql
+	echo 'create table tbl(a int primary key, b int, c int) engine=innodb default charset=latin1 collate=latin1_bin;' >${WORK_DIR}/schema.sql
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"binlog-schema update test ${shardddl1} ${tb1} ${WORK_DIR}/schema.sql -s mysql-replica-01" \
 		"\"result\": true" 2
@@ -583,9 +583,9 @@ function DM_147_CASE {
 # Add and Drop multiple fields and then rollback.
 function DM_147 {
 	run_case 147 "double-source-optimistic" \
-		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, c int) engine=innodb default charset=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, c int) engine=innodb default charset=latin1;\"; \
-     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, c int) engine=innodb default charset=latin1;\"" \
+		"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"; \
+     run_sql_source2 \"create table ${shardddl1}.${tb2} (a int primary key, c int) engine=innodb default charset=latin1 collate=latin1_bin;\"" \
 		"clean_table" "optimistic"
 }
 
diff --git a/dm/tests/sharding/data/db1.increment2.sql b/dm/tests/sharding/data/db1.increment2.sql
index 4ad8597e94c..13cbdc7a010 100644
--- a/dm/tests/sharding/data/db1.increment2.sql
+++ b/dm/tests/sharding/data/db1.increment2.sql
@@ -1,8 +1,8 @@
 create database `sharding2`;
 use `sharding2`;
-CREATE TABLE `t1` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`)) DEFAULT CHARSET=utf8mb4;
-CREATE TABLE `t2` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`)) DEFAULT CHARSET=utf8mb4;
-CREATE TABLE `t3` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`)) DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `t1` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`));
+CREATE TABLE `t2` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`));
+CREATE TABLE `t3` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`));
 insert into `sharding1`.t1 (uid, name, info, age) values (10007, 'bruce wayne', '{"wealtch": "unknown"}', 1000), (10008, 'connelly', '{"boolean": true}', 1001);
 insert into `sharding1`.t2 (uid, name, info, age) values (20009, 'haxwell', '{"key": "value000"}', 3003);
 insert into `sharding2`.t1 (uid, name, info, age) values (60001, 'hello', '{"age": 201}', 133), (60002, 'world', '{"age": 202}', 233), (60003, 'final', '{"key": "value", "age": 203}', 333);
diff --git a/dm/tests/sharding/data/db1.prepare.sql b/dm/tests/sharding/data/db1.prepare.sql
index 91f4203f0d5..ddf9e6cddbe 100644
--- a/dm/tests/sharding/data/db1.prepare.sql
+++ b/dm/tests/sharding/data/db1.prepare.sql
@@ -2,7 +2,7 @@ drop database if exists `sharding1`;
 drop database if exists `sharding2`;
 create database `sharding1`;
 use `sharding1`;
-create table t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t1 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`));
+create table t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`));
 insert into t1 (uid, name) values (10001, 'Gabriel García Márquez'), (10002, 'Cien años de soledad');
 insert into t2 (uid, name) values (20001, 'José Arcadio Buendía'), (20002, 'Úrsula Iguarán'), (20003, 'José Arcadio');
diff --git a/dm/tests/sharding/data/db2.increment2.sql b/dm/tests/sharding/data/db2.increment2.sql
index a1a25a84379..5eec6602d51 100644
--- a/dm/tests/sharding/data/db2.increment2.sql
+++ b/dm/tests/sharding/data/db2.increment2.sql
@@ -1,6 +1,6 @@
 create database `sharding2`;
 use `sharding2`;
-CREATE TABLE `t4` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`)) DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `t4` (`id` bigint(20) AUTO_INCREMENT, `uid` int(11), `name` varchar(80), `info` varchar(100), `age` int(11), `info_json` json GENERATED ALWAYS AS (`info`) VIRTUAL, `id_gen` int(11) GENERATED ALWAYS AS ((`uid` + 1)) VIRTUAL, create_by DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), UNIQUE KEY `uid` (`uid`), UNIQUE KEY `id_gen` (`id_gen`), KEY `multi_col_idx` (`uid`,`id_gen`));
 insert into `sharding2`.t4 (uid, name, info) values (70001, 'golang', '{"age": 6}'), (70002, 'rust con', '{"age": 1}'), (70003, 'javascript', '{"key": "value", "age": 20}');
 insert into `sharding1`.t2 (uid, name, info) values (50002, 'tyuil', '{"ghjkl;": "as a standby"}'), (50003, 'xxxxx', '{"boolean": false, "k": "v"}');
 insert into `sharding1`.t3 (uid, name, info) values (30004, 'hhhhhh', '{"key1": "value000"}');
diff --git a/dm/tests/sharding/data/db2.prepare.sql b/dm/tests/sharding/data/db2.prepare.sql
index 4d6ed28b48a..70e8dcdd911 100644
--- a/dm/tests/sharding/data/db2.prepare.sql
+++ b/dm/tests/sharding/data/db2.prepare.sql
@@ -2,7 +2,7 @@ drop database if exists `sharding1`;
 drop database if exists `sharding2`;
 create database `sharding1`;
 use `sharding1`;
-create table t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
-create table t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`)) DEFAULT CHARSET=utf8mb4;
+create table t2 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`));
+create table t3 (id bigint auto_increment, uid int, name varchar(80), info varchar(100), primary key (`id`), unique key(`uid`));
 insert into t2 (uid, name, info) values (40000, 'Remedios Moscote', '{}');
 insert into t3 (uid, name, info) values (30001, 'Aureliano José', '{}'), (30002, 'Santa Sofía de la Piedad', '{}'), (30003, '17 Aurelianos', NULL);
diff --git a/dm/tests/tls/run.sh b/dm/tests/tls/run.sh
index 9e640958d70..3e3ccc1c7ed 100644
--- a/dm/tests/tls/run.sh
+++ b/dm/tests/tls/run.sh
@@ -118,30 +118,31 @@ function test_worker_download_certs_from_master() {
 		"start-task $WORK_DIR/dm-task.yaml"
 
 	# task should be paused.
-	run_dm_ctl_with_tls_and_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" $cur/conf/ca.pem $cur/conf/dm.pem $cur/conf/dm.key \
-		"query-status test" \
-		"\"result\": true" 2 \
-		"\"stage\": \"Paused\"" 1
-
-	# change task-ca.pem name to test wheather dm-worker will dump certs from dm-master
-	mv "$cur/conf/task-ca.pem" "$cur/conf/task-ca.pem.bak"
-
-	# kill dm-worker 1 and clean the failpoint
-	export GO_FAILPOINTS=''
-	ps aux | grep dm-worker1 | awk '{print $2}' | xargs kill || true
-	check_port_offline $WORKER1_PORT 20
-	run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $WORK_DIR/dm-worker1.toml
-	check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT "$cur/conf/ca.pem" "$cur/conf/dm.pem" "$cur/conf/dm.key"
-
-	# dm-worker will dump task-ca.pem from dm-master and save it to dm-worker-dir/ca.pem
-	# let's try use this file to connect dm-master
-	run_dm_ctl_with_tls_and_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" /tmp/dm_test/tls/worker1/ca.pem $cur/conf/dm.pem $cur/conf/dm.key \
-		"query-status test" \
-		"\"result\": true" 2
-
-	echo "check data"
-	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
-	mv "$cur/conf/task-ca.pem.bak" "$cur/conf/task-ca.pem"
+	# TODO: revert this when lightning support tls
+	#	run_dm_ctl_with_tls_and_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" $cur/conf/ca.pem $cur/conf/dm.pem $cur/conf/dm.key \
+	#		"query-status test" \
+	#		"\"result\": true" 2 \
+	#		"\"stage\": \"Paused\"" 1
+	#
+	#	# change task-ca.pem name to test wheather dm-worker will dump certs from dm-master
+	#	mv "$cur/conf/task-ca.pem" "$cur/conf/task-ca.pem.bak"
+	#
+	#	# kill dm-worker 1 and clean the failpoint
+	#	export GO_FAILPOINTS=''
+	#	ps aux | grep dm-worker1 | awk '{print $2}' | xargs kill || true
+	#	check_port_offline $WORKER1_PORT 20
+	#	run_dm_worker $WORK_DIR/worker1 $WORKER1_PORT $WORK_DIR/dm-worker1.toml
+	#	check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT "$cur/conf/ca.pem" "$cur/conf/dm.pem" "$cur/conf/dm.key"
+	#
+	#	# dm-worker will dump task-ca.pem from dm-master and save it to dm-worker-dir/ca.pem
+	#	# let's try use this file to connect dm-master
+	#	run_dm_ctl_with_tls_and_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" /tmp/dm_test/tls/worker1/ca.pem $cur/conf/dm.pem $cur/conf/dm.key \
+	#		"query-status test" \
+	#		"\"result\": true" 2
+	#
+	#	echo "check data"
+	#	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
+	#	mv "$cur/conf/task-ca.pem.bak" "$cur/conf/task-ca.pem"
 }
 
 function test_worker_ha_when_enable_source_tls() {
diff --git a/go.mod b/go.mod
index 0012a3dbcda..8c01ad2dbf4 100644
--- a/go.mod
+++ b/go.mod
@@ -54,11 +54,12 @@ require (
 	github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
 	github.com/pingcap/errors v0.11.5-0.20211009033009-93128226aaa3
 	github.com/pingcap/failpoint v0.0.0-20210316064728-7acb0f0a3dfd
-	github.com/pingcap/kvproto v0.0.0-20211029081837-3c7bd947cf9b
+	github.com/pingcap/kvproto v0.0.0-20211202065422-a412f7a319c3
 	github.com/pingcap/log v0.0.0-20210906054005-afc726e70354
-	github.com/pingcap/tidb v1.1.0-beta.0.20211115203106-b076e193b320
+	github.com/pingcap/tidb v1.1.0-beta.0.20211204151954-e3e2e8d946f4
 	github.com/pingcap/tidb-tools v5.2.3-0.20211105044302-2dabb6641a6e+incompatible
-	github.com/pingcap/tidb/parser v0.0.0-20211117085347-276721877cf8
+	github.com/pingcap/tidb/parser v0.0.0-20211204151954-e3e2e8d946f4
+	github.com/pingcap/tipb v0.0.0-20211201080053-bd104bb270ba // indirect
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/r3labs/diff v1.1.0
@@ -74,8 +75,8 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
 	github.com/tidwall/gjson v1.9.1
 	github.com/tidwall/sjson v1.2.2
-	github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211115071040-a3f1c41ac1a0
-	github.com/tikv/pd v1.1.0-beta.0.20211104095303-69c86d05d379
+	github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211201083510-3a7675742ee5
+	github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee
 	github.com/tinylib/msgp v1.1.0
 	github.com/uber-go/atomic v1.4.0
 	github.com/unrolled/render v1.0.1
@@ -83,7 +84,7 @@ require (
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20210512015243-d19fbe541bf9
 	go.uber.org/atomic v1.9.0
-	go.uber.org/goleak v1.1.11-0.20210813005559-691160354723
+	go.uber.org/goleak v1.1.12
 	go.uber.org/multierr v1.7.0
 	go.uber.org/zap v1.19.1
 	golang.org/x/net v0.0.0-20211020060615-d418f374d309
diff --git a/go.sum b/go.sum
index 822f6685491..b99ed82df82 100644
--- a/go.sum
+++ b/go.sum
@@ -815,8 +815,10 @@ github.com/pingcap/kvproto v0.0.0-20210219064844-c1844a4775d6/go.mod h1:IOdRDPLy
 github.com/pingcap/kvproto v0.0.0-20210805052247-76981389e818/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
 github.com/pingcap/kvproto v0.0.0-20210819164333-bd5706b9d9f2/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
 github.com/pingcap/kvproto v0.0.0-20210915062418-0f5764a128ad/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
-github.com/pingcap/kvproto v0.0.0-20211029081837-3c7bd947cf9b h1:/aj6ITlHSJZmsm4hIMOgJAAZti+Dmq11tCyKedA6Dcs=
-github.com/pingcap/kvproto v0.0.0-20211029081837-3c7bd947cf9b/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
+github.com/pingcap/kvproto v0.0.0-20211109071446-a8b4d34474bc/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
+github.com/pingcap/kvproto v0.0.0-20211122024046-03abd340988f/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
+github.com/pingcap/kvproto v0.0.0-20211202065422-a412f7a319c3 h1:PZMewlB2b5JC0pMteDmWNBtAgmJv2ih1+z+WifdVcEk=
+github.com/pingcap/kvproto v0.0.0-20211202065422-a412f7a319c3/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI=
 github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
 github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
 github.com/pingcap/log v0.0.0-20201112100606-8f1e84a3abc8/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
@@ -831,23 +833,24 @@ github.com/pingcap/sysutil v0.0.0-20210315073920-cc0985d983a3/go.mod h1:tckvA041
 github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5 h1:7rvAtZe/ZUzOKzgriNPQoBNvleJXBk4z7L3Z47+tS98=
 github.com/pingcap/sysutil v0.0.0-20210730114356-fcd8a63f68c5/go.mod h1:XsOaV712rUk63aOEKYP9PhXTIE3FMNHmC2r1wX5wElY=
 github.com/pingcap/tidb v1.1.0-beta.0.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg=
-github.com/pingcap/tidb v1.1.0-beta.0.20211115203106-b076e193b320 h1:JRnw/tws+kVSWGI6tI9IHI2tmxBD2TbYG1f0RkWjuJY=
-github.com/pingcap/tidb v1.1.0-beta.0.20211115203106-b076e193b320/go.mod h1:bfqR3KX+rTcefCqLSDhHxWWf30gQBRo/bt/FAOc2Tk4=
+github.com/pingcap/tidb v1.1.0-beta.0.20211204151954-e3e2e8d946f4 h1:axJl34ZMFxOGkobA7+O+fk2uIXU255pcgFu5HPKeh2I=
+github.com/pingcap/tidb v1.1.0-beta.0.20211204151954-e3e2e8d946f4/go.mod h1:XBf5r8z1gxV9gQlaiikJ9B9xea4BKdcoUKx/QOZoq8Q=
 github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo=
 github.com/pingcap/tidb-dashboard v0.0.0-20210716172320-2226872e3296/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ=
 github.com/pingcap/tidb-dashboard v0.0.0-20211008050453-a25c25809529/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ=
-github.com/pingcap/tidb-dashboard v0.0.0-20211031170437-08e58c069a2a/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ=
+github.com/pingcap/tidb-dashboard v0.0.0-20211107164327-80363dfbe884/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ=
 github.com/pingcap/tidb-tools v5.0.3+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
 github.com/pingcap/tidb-tools v5.2.2-0.20211019062242-37a8bef2fa17+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
 github.com/pingcap/tidb-tools v5.2.3-0.20211105044302-2dabb6641a6e+incompatible h1:acgn+tiufY2FnubfxaBuRjqvrknesyP8tXOTi2Otkwg=
 github.com/pingcap/tidb-tools v5.2.3-0.20211105044302-2dabb6641a6e+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
 github.com/pingcap/tidb/parser v0.0.0-20211011031125-9b13dc409c5e/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg=
 github.com/pingcap/tidb/parser v0.0.0-20211023132847-efa94595c071/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg=
-github.com/pingcap/tidb/parser v0.0.0-20211117085347-276721877cf8 h1:Rj28acmWKZuDi4WdFl6+S/lZssqafHzNFEV4hATMTDo=
-github.com/pingcap/tidb/parser v0.0.0-20211117085347-276721877cf8/go.mod h1:MAa22tagoj7nv5b1NBcxPkc5CiUNhqj1wuSQnw4f9WE=
+github.com/pingcap/tidb/parser v0.0.0-20211204151954-e3e2e8d946f4 h1:/6Wp++NoMq1qvAEBImbReARkN0ND1889QgtEijO3Gtw=
+github.com/pingcap/tidb/parser v0.0.0-20211204151954-e3e2e8d946f4/go.mod h1:ElJiub4lRy6UZDb+0JHDkGEdr6aOli+ykhyej7VCLoI=
 github.com/pingcap/tipb v0.0.0-20211008080435-3fd327dfce0e/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
-github.com/pingcap/tipb v0.0.0-20211105090418-71142a4d40e3 h1:xnp/Qkk5gELlB8TaY6oro0JNXMBXTafNVxU/vbrNU8I=
-github.com/pingcap/tipb v0.0.0-20211105090418-71142a4d40e3/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
+github.com/pingcap/tipb v0.0.0-20211116093845-e9b045a0bdf8/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
+github.com/pingcap/tipb v0.0.0-20211201080053-bd104bb270ba h1:Tt5W/maVBUbG+wxg2nfc88Cqj/HiWYb0TJQ2Rfi0UOQ=
+github.com/pingcap/tipb v0.0.0-20211201080053-bd104bb270ba/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1012,13 +1015,13 @@ github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
 github.com/tidwall/sjson v1.2.2 h1:H1Llj/C9G+BoUN2DsybLHjWvr9dx4Uazavf0sXQ+rOs=
 github.com/tidwall/sjson v1.2.2/go.mod h1:jmW2RZpbKuExPFUHeFSBMiovT9ZyOziEHDRkbsdp0B0=
 github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211011083157-49c8dd23f1f0/go.mod h1:00plYwQsQ5kBUmafHO+JkjznGgFaBokMZl82TZIbsQk=
-github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211115071040-a3f1c41ac1a0 h1:c12Pv8Xks4oubDr/uHHxrlBkwGJFqKZUEIUemHV794g=
-github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211115071040-a3f1c41ac1a0/go.mod h1:iiwtsCxcbNLK5i9VRYGvdcihgHXTKy2ukWjoaJsrphg=
+github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211201083510-3a7675742ee5 h1:c0zWUeB8aog6TceRyFEjA2fYUJka8RNGBZWU5l7XF9g=
+github.com/tikv/client-go/v2 v2.0.0-alpha.0.20211201083510-3a7675742ee5/go.mod h1:wRuh+W35daKTiYBld0oBlT6PSkzEVr+pB/vChzJZk+8=
 github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d/go.mod h1:Jw9KG11C/23Rr7DW4XWQ7H5xOgGZo6DFL1OKAF4+Igw=
 github.com/tikv/pd v1.1.0-beta.0.20210818082359-acba1da0018d/go.mod h1:rammPjeZgpvfrQRPkijcx8tlxF1XM5+m6kRXrkDzCAA=
 github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae/go.mod h1:varH0IE0jJ9E9WN2Ei/N6pajMlPkcXdDEf7f5mmsUVQ=
-github.com/tikv/pd v1.1.0-beta.0.20211104095303-69c86d05d379 h1:nFm1jQDz1iRktoyV2SyM5zVk6+PJHQNunJZ7ZJcqzAo=
-github.com/tikv/pd v1.1.0-beta.0.20211104095303-69c86d05d379/go.mod h1:y+09hAUXJbrd4c0nktL74zXDDuD7atGtfOKxL90PCOE=
+github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee h1:rAAdvQ8Hh36syHr92g0VmZEpkH+40RGQBpFL2121xMs=
+github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee/go.mod h1:lRbwxBAhnTQR5vqbTzeI/Bj62bD2OvYYuFezo2vrmeI=
 github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M=
@@ -1131,8 +1134,9 @@ go.uber.org/dig v1.8.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw=
 go.uber.org/fx v1.10.0/go.mod h1:vLRicqpG/qQEzno4SYU86iCwfT95EZza+Eba0ItuxqY=
 go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
@@ -1175,6 +1179,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5U
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1694,8 +1699,21 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.2.0/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
+modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8=
+modernc.org/golex v1.0.1/go.mod h1:QCA53QtsT1NdGkaZZkF5ezFwk4IXh4BGNafAARTC254=
+modernc.org/lex v1.0.0/go.mod h1:G6rxMTy3cH2iA0iXL/HRRv4Znu8MK4higxph/lE7ypk=
+modernc.org/lexer v1.0.0/go.mod h1:F/Dld0YKYdZCLQ7bD0USbWL4YKCyTDRDHiDTOs0q0vk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
+modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/parser v1.0.0/go.mod h1:H20AntYJ2cHHL6MHthJ8LZzXCdDCHMWt1KZXtIMjejA=
+modernc.org/parser v1.0.2/go.mod h1:TXNq3HABP3HMaqLK7brD1fLA/LfN0KS6JxZn71QdDqs=
+modernc.org/scanner v1.0.1/go.mod h1:OIzD2ZtjYk6yTuyqZr57FmifbM9fIH74SumloSsajuE=
+modernc.org/sortutil v1.0.0/go.mod h1:1QO0q8IlIlmjBIwm6t/7sof874+xCfZouyqZMLIAtxM=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/y v1.0.1/go.mod h1:Ho86I+LVHEI+LYXoUKlmOMAM1JTXOCfj8qi1T8PsClE=
 moul.io/zapgorm2 v1.1.0/go.mod h1:emRfKjNqSzVj5lcgasBdovIXY1jSOwFz2GQZn1Rddks=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
diff --git a/pkg/txnutil/lock_resolver.go b/pkg/txnutil/lock_resolver.go
index 299fedddf20..bead096a0d2 100644
--- a/pkg/txnutil/lock_resolver.go
+++ b/pkg/txnutil/lock_resolver.go
@@ -106,7 +106,7 @@ func (r *resolver) Resolve(ctx context.Context, regionID uint64, maxVersion uint
 			locks[i] = txnkv.NewLock(locksInfo[i])
 		}
 
-		_, _, err1 := r.kvStorage.GetLockResolver().ResolveLocks(bo, 0, locks)
+		_, err1 := r.kvStorage.GetLockResolver().ResolveLocks(bo, 0, locks)
 		if err1 != nil {
 			return errors.Trace(err1)
 		}