From adeeb3c19f91274f5867ee50234a58a755021219 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 17 Dec 2021 15:18:35 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #3914 Signed-off-by: ti-chi-bot --- dm/tests/all_mode/run.sh | 3 +++ go.mod | 6 ++++++ go.sum | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/dm/tests/all_mode/run.sh b/dm/tests/all_mode/run.sh index 3d57c1fef24..3ed3578086c 100755 --- a/dm/tests/all_mode/run.sh +++ b/dm/tests/all_mode/run.sh @@ -380,6 +380,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 90b9c296732..b40468ca8a0 100644 --- a/go.mod +++ b/go.mod @@ -22,9 +22,15 @@ require ( github.com/edwingeng/deque v0.0.0-20191220032131-8596380dee17 github.com/fatih/color v1.10.0 github.com/frankban/quicktest v1.11.1 // indirect +<<<<<<< HEAD github.com/getkin/kin-openapi v0.79.0 github.com/gin-gonic/gin v1.7.0 github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929 +======= + 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.20211217061939-06f932768788 +>>>>>>> 84acdbc55 (dep(dm): update go-mysql (#3914)) 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 e333ecd701f..d3181e93619 100644 --- a/go.sum +++ b/go.sum @@ -314,8 +314,13 @@ 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= +<<<<<<< HEAD github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929 h1:cjv3hcFlmma66+fYTvhHt/sbwZWWJs09iv2ipVRIr0I= github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929/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= +>>>>>>> 84acdbc55 (dep(dm): update go-mysql (#3914)) 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 334e1be1ecad0186f13483c917355f40c144bf24 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 17 Dec 2021 15:32:11 +0800 Subject: [PATCH 2/2] fix conflict --- go.mod | 6 ------ go.sum | 5 ----- 2 files changed, 11 deletions(-) diff --git a/go.mod b/go.mod index b40468ca8a0..5dea026b880 100644 --- a/go.mod +++ b/go.mod @@ -22,15 +22,9 @@ require ( github.com/edwingeng/deque v0.0.0-20191220032131-8596380dee17 github.com/fatih/color v1.10.0 github.com/frankban/quicktest v1.11.1 // indirect -<<<<<<< HEAD github.com/getkin/kin-openapi v0.79.0 github.com/gin-gonic/gin v1.7.0 - github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929 -======= - 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.20211217061939-06f932768788 ->>>>>>> 84acdbc55 (dep(dm): update go-mysql (#3914)) 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 d3181e93619..d9448e91b09 100644 --- a/go.sum +++ b/go.sum @@ -314,13 +314,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= -<<<<<<< HEAD -github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929 h1:cjv3hcFlmma66+fYTvhHt/sbwZWWJs09iv2ipVRIr0I= -github.com/go-mysql-org/go-mysql v1.1.3-0.20210705101833-83965e516929/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= ->>>>>>> 84acdbc55 (dep(dm): update go-mysql (#3914)) 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=