From 7727afda7ab9ec6cb62c1fe870a48a6fadaf0c70 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 16 Dec 2021 14:36:32 +0800 Subject: [PATCH 1/4] dep(dm): update go-mysql --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6883519d34b..17f2198b98b 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/frankban/quicktest v1.11.1 // indirect github.com/getkin/kin-openapi v0.80.0 github.com/gin-gonic/gin v1.7.4 - github.com/go-mysql-org/go-mysql v1.1.3-0.20211111092245-d7f36836d6b7 + github.com/go-mysql-org/go-mysql v1.4.0 github.com/go-sql-driver/mysql v1.6.0 github.com/gogo/gateway v1.1.0 github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index 443b3e4d0f6..6691331d4ae 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-mysql-org/go-mysql v1.1.3-0.20211111092245-d7f36836d6b7 h1:7e1SUamaZct05YYDhshX7Mi95F79O9U+O8CbCJL5Cx8= -github.com/go-mysql-org/go-mysql v1.1.3-0.20211111092245-d7f36836d6b7/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= +github.com/go-mysql-org/go-mysql v1.4.0 h1:Y7fYkFzvveXPyFtEDp3izPcXDHKVv/XD7xzky1kamO0= +github.com/go-mysql-org/go-mysql v1.4.0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= From 5281cb789b4919e1104f60e8aeb512ecbbc0c951 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 17 Dec 2021 10:18:16 +0800 Subject: [PATCH 2/4] save work --- dm/tests/all_mode/run.sh | 3 +++ go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dm/tests/all_mode/run.sh b/dm/tests/all_mode/run.sh index ce27dce043c..ed4d3981dfb 100755 --- a/dm/tests/all_mode/run.sh +++ b/dm/tests/all_mode/run.sh @@ -377,6 +377,9 @@ function run() { # use sync_diff_inspector to check full dump loader check_sync_diff $WORK_DIR $cur/conf/diff_config.toml + run_sql_source1 "SHOW SLAVE HOSTS;" + check_contains 'Slave_UUID' + run_sql_tidb "set time_zone = '+04:00';SELECT count(*) from all_mode.no_diff where dt = ts;" check_contains "count(*): 3" diff --git a/go.mod b/go.mod index 17f2198b98b..f5e86cfe4e1 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/frankban/quicktest v1.11.1 // indirect github.com/getkin/kin-openapi v0.80.0 github.com/gin-gonic/gin v1.7.4 - github.com/go-mysql-org/go-mysql v1.4.0 + github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0 github.com/go-sql-driver/mysql v1.6.0 github.com/gogo/gateway v1.1.0 github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index 6691331d4ae..44727d0f655 100644 --- a/go.sum +++ b/go.sum @@ -323,6 +323,8 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-mysql-org/go-mysql v1.4.0 h1:Y7fYkFzvveXPyFtEDp3izPcXDHKVv/XD7xzky1kamO0= github.com/go-mysql-org/go-mysql v1.4.0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= +github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0 h1:CnDHkEx0XPQXXliM1JO35nHmNuYYT5zZ81hHp3EjY3o= +github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= From 86820198269ffe030e150f63e3b5ab5bbc76d29a Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 17 Dec 2021 10:57:02 +0800 Subject: [PATCH 3/4] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 44727d0f655..5d02f5f2908 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-mysql-org/go-mysql v1.4.0 h1:Y7fYkFzvveXPyFtEDp3izPcXDHKVv/XD7xzky1kamO0= -github.com/go-mysql-org/go-mysql v1.4.0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0 h1:CnDHkEx0XPQXXliM1JO35nHmNuYYT5zZ81hHp3EjY3o= github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= From 0cc9853db2b2dbf5f39c528f1a36ba7e9f2d0244 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 17 Dec 2021 14:20:49 +0800 Subject: [PATCH 4/4] update again --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f5e86cfe4e1..7d72e0f6a2f 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/frankban/quicktest v1.11.1 // indirect github.com/getkin/kin-openapi v0.80.0 github.com/gin-gonic/gin v1.7.4 - github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0 + github.com/go-mysql-org/go-mysql v1.4.1-0.20211217061939-06f932768788 github.com/go-sql-driver/mysql v1.6.0 github.com/gogo/gateway v1.1.0 github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index 5d02f5f2908..5dfb183a70b 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0 h1:CnDHkEx0XPQXXliM1JO35nHmNuYYT5zZ81hHp3EjY3o= -github.com/go-mysql-org/go-mysql v1.4.1-0.20211216142820-0c0b8171f9f0/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= +github.com/go-mysql-org/go-mysql v1.4.1-0.20211217061939-06f932768788 h1:0IsP4ViNmA7ZElbCE4/lINdTppdw3jdcAiJaPDyeHx8= +github.com/go-mysql-org/go-mysql v1.4.1-0.20211217061939-06f932768788/go.mod h1:3lFZKf7l95Qo70+3XB2WpiSf9wu2s3na3geLMaIIrqQ= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=