From 890e89bab1eafc08a47363b10fb37d8ee47ad774 Mon Sep 17 00:00:00 2001 From: Xiaoyuan Jin Date: Mon, 30 Sep 2024 12:03:33 +0800 Subject: [PATCH] This is an automated cherry-pick of #11630 Signed-off-by: ti-chi-bot --- dm/debug-tools/binlog-event-blackhole/fetcher.go | 3 +-- go.mod | 5 +++++ go.sum | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dm/debug-tools/binlog-event-blackhole/fetcher.go b/dm/debug-tools/binlog-event-blackhole/fetcher.go index 2a8cba262bb..34d81ecead2 100644 --- a/dm/debug-tools/binlog-event-blackhole/fetcher.go +++ b/dm/debug-tools/binlog-event-blackhole/fetcher.go @@ -26,8 +26,7 @@ import ( // registerSlave register a slave connection on the master. func registerSlave(addr, username, password string, serverID uint32) (*client.Conn, error) { - conn, err := client.Connect(addr, username, password, "", func(c *client.Conn) { - }) + conn, err := client.Connect(addr, username, password, "") if err != nil { return nil, errors.Annotate(err, "connect to the master") } diff --git a/go.mod b/go.mod index 8c1a2936f8f..825b04e75ee 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,12 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/glebarez/go-sqlite v1.21.2 github.com/glebarez/sqlite v1.7.0 +<<<<<<< HEAD github.com/go-mysql-org/go-mysql v1.7.1-0.20240507075657-2bd4573edde2 +======= + github.com/go-mysql-org/go-mysql v1.9.1 + github.com/go-oauth2/oauth2/v4 v4.5.2 +>>>>>>> dec7d0eb76 (gomod(dm): upgrade go-mysql to 1.9.1 (#11630)) github.com/go-ozzo/ozzo-validation/v4 v4.3.0 github.com/go-sql-driver/mysql v1.7.1 github.com/goccy/go-json v0.10.2 diff --git a/go.sum b/go.sum index 8505e0c2990..0cb05e126ff 100644 --- a/go.sum +++ b/go.sum @@ -352,9 +352,16 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +<<<<<<< HEAD github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-mysql-org/go-mysql v1.7.1-0.20240507075657-2bd4573edde2 h1:DU4x9rUmzjuOnXg5hgX5kUqj1HmKzN+rU3bsIy7oWok= github.com/go-mysql-org/go-mysql v1.7.1-0.20240507075657-2bd4573edde2/go.mod h1:kwbF156Z9Sy8amP3E1SZp7/s/0PuJj/xKaOWToQiq0Y= +======= +github.com/go-mysql-org/go-mysql v1.9.1 h1:W2ZKkHkoM4mmkasJCoSYfaE4RQNxXTb6VqiaMpKFrJc= +github.com/go-mysql-org/go-mysql v1.9.1/go.mod h1:+SgFgTlqjqOQoMc98n9oyUWEgn2KkOL1VmXDoq2ONOs= +github.com/go-oauth2/oauth2/v4 v4.5.2 h1:CuZhD3lhGuI6aNLyUbRHXsgG2RwGRBOuCBfd4WQKqBQ= +github.com/go-oauth2/oauth2/v4 v4.5.2/go.mod h1:wk/2uLImWIa9VVQDgxz99H2GDbhmfi/9/Xr+GvkSUSQ= +>>>>>>> dec7d0eb76 (gomod(dm): upgrade go-mysql to 1.9.1 (#11630)) github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=