diff --git a/scripts/download-integration-test-binaries.sh b/scripts/download-integration-test-binaries.sh index 0689f24328d..da20d2de925 100755 --- a/scripts/download-integration-test-binaries.sh +++ b/scripts/download-integration-test-binaries.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 20201 PingCAP, Inc. +# Copyright 2021 PingCAP, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration_tests/_utils/check_sync_diff b/tests/integration_tests/_utils/check_sync_diff index 7f1b72e3f7c..b0824e1473f 100755 --- a/tests/integration_tests/_utils/check_sync_diff +++ b/tests/integration_tests/_utils/check_sync_diff @@ -21,7 +21,7 @@ cd $workdir i=0 while [ $i -lt $check_time ]; do rm -rf $workdir/sync_diff/ - $binary --config=$conf >>$LOG 2>&1 + $binary --log-level=debug --config=$conf >>$LOG 2>&1 ret=$? if [ "$ret" == 0 ]; then echo "check diff successfully" diff --git a/tests/integration_tests/canal_json_basic/data/data.sql b/tests/integration_tests/canal_json_basic/data/data.sql index dfc1f40d725..b6fc1c90e42 100644 --- a/tests/integration_tests/canal_json_basic/data/data.sql +++ b/tests/integration_tests/canal_json_basic/data/data.sql @@ -41,9 +41,7 @@ CREATE TABLE multi_data_type -- t_bit BIT(64), t_json JSON, PRIMARY KEY (id) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8 - COLLATE = utf8_bin; +); INSERT INTO multi_data_type( t_tinyint, t_tinyint_unsigned, t_smallint, t_smallint_unsigned, t_mediumint , t_mediumint_unsigned, t_int, t_int_unsigned, t_bigint, t_bigint_unsigned @@ -55,7 +53,7 @@ INSERT INTO multi_data_type( t_tinyint, t_tinyint_unsigned, t_smallint, t_smalli , t_set, t_json) VALUES ( -1, 1, -129, 129, -65536, 65536, -16777216, 16777216, -2147483649, 2147483649 , true, 123.456, 123.123, 123456789012.123456789012 - , '测', '测试', x'89504E470D0A1A0A', x'89504E470D0A1A0A', '测试tinytext', '测试text', '测试mediumtext', '测试longtext' + , '测', '测试', '89504E470D0A1A0A', '89504E470D0A1A0A', '测试tinytext', '测试text', '测试mediumtext', '测试longtext' , 'tinyblob', 'blob', 'mediumblob', 'longblob' , '1977-01-01', '9999-12-31 23:59:59', '19731230153000', '23:59:59' , 'enum2' @@ -71,7 +69,7 @@ INSERT INTO multi_data_type( t_tinyint, t_tinyint_unsigned, t_smallint, t_smalli , t_set, t_json) VALUES ( -2, 2, -130, 130, -65537, 65537, -16777217, 16777217, -2147483650, 2147483650 , false, 123.4567, 123.1237, 123456789012.1234567890127 - , '2', '测试2', x'89504E470D0A1A0B', x'89504E470D0A1A0B', '测试2tinytext', '测试2text', '测试2mediumtext', '测试longtext' + , '2', '测试2', '89504E470D0A1A0B', '89504E470D0A1A0B', '测试2tinytext', '测试2text', '测试2mediumtext', '测试longtext' , 'tinyblob2', 'blob2', 'mediumblob2', 'longblob2' , '2021-01-01', '2021-12-31 23:59:59', '19731230153000', '22:59:59' , 'enum1'