From 2df2144aa204ed65358bf5a45fd0e4b4d986a65f Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:29:22 +0200 Subject: [PATCH] resovle conflict Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- go/vt/vttablet/grpctmclient/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go index 7233ec128a5..ca55ec7d521 100644 --- a/go/vt/vttablet/grpctmclient/client.go +++ b/go/vt/vttablet/grpctmclient/client.go @@ -528,7 +528,7 @@ func (client *Client) ExecuteMultiFetchAsDba(ctx context.Context, tablet *topoda var err error if usePool { if poolDialer, ok := client.dialer.(poolDialer); ok { - c, err = poolDialer.dialPool(ctx, tablet) + c, _, err = poolDialer.dialPool(ctx, DialPoolGroupDefault, tablet) if err != nil { return nil, err }