From 01950c9450604583fe2c4ca7849cd4cb82aa7972 Mon Sep 17 00:00:00 2001 From: Toliver Jue Date: Thu, 9 Jan 2020 10:04:48 +0100 Subject: [PATCH 1/2] Advertise support for FOUND ROWS from server Signed-off-by: Toliver Jue --- go/mysql/server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/mysql/server.go b/go/mysql/server.go index 181e91905ba..0973ee9bd6d 100644 --- a/go/mysql/server.go +++ b/go/mysql/server.go @@ -489,6 +489,7 @@ func (l *Listener) isShutdown() bool { func (c *Conn) writeHandshakeV10(serverVersion string, authServer AuthServer, enableTLS bool) ([]byte, error) { capabilities := CapabilityClientLongPassword | CapabilityClientLongFlag | + CapabilityClientFoundRows | CapabilityClientConnectWithDB | CapabilityClientProtocol41 | CapabilityClientTransactions | From 3df2fd917388fbd0a17843fc931d2ccecc36e303 Mon Sep 17 00:00:00 2001 From: Toliver Jue Date: Thu, 9 Jan 2020 10:30:37 +0100 Subject: [PATCH 2/2] Fix order Signed-off-by: Toliver Jue --- go.mod | 2 ++ go/mysql/server.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7f7f0100e04..0661ef2057e 100644 --- a/go.mod +++ b/go.mod @@ -50,6 +50,8 @@ require ( github.com/mattn/go-runewidth v0.0.1 // indirect github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984 github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02 github.com/opentracing/opentracing-go v1.1.0 diff --git a/go/mysql/server.go b/go/mysql/server.go index 0973ee9bd6d..0ee6dfb2132 100644 --- a/go/mysql/server.go +++ b/go/mysql/server.go @@ -488,8 +488,8 @@ func (l *Listener) isShutdown() bool { // It returns the salt data. func (c *Conn) writeHandshakeV10(serverVersion string, authServer AuthServer, enableTLS bool) ([]byte, error) { capabilities := CapabilityClientLongPassword | - CapabilityClientLongFlag | CapabilityClientFoundRows | + CapabilityClientLongFlag | CapabilityClientConnectWithDB | CapabilityClientProtocol41 | CapabilityClientTransactions |