From 6171fc6b726c9a6ad453487b8f34143311ea131b Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Tue, 5 Mar 2019 16:24:35 +0100 Subject: [PATCH] Update go-mysql-server to make kill query works properly Signed-off-by: Antonio Jesus Navarro Perez --- Gopkg.lock | 4 ++-- Gopkg.toml | 2 +- docs/using-gitbase/functions.md | 2 +- docs/using-gitbase/indexes.md | 2 +- docs/using-gitbase/supported-clients.md | 2 +- docs/using-gitbase/supported-syntax.md | 2 +- vendor/gopkg.in/src-d/go-mysql-server.v0/server/handler.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index fd89544b3..db3644420 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -664,7 +664,7 @@ source = "github.com/src-d/go-git" [[projects]] - digest = "1:0056c43a3fc6780d46aeedf43d08a039801668c6e6f6b33b97f2d53822e434e8" + digest = "1:038546cbff2ae3af553f9f623c8c729556ed87ef296c22f9026dfd0cee798bc7" name = "gopkg.in/src-d/go-mysql-server.v0" packages = [ ".", @@ -683,7 +683,7 @@ "sql/plan", ] pruneopts = "NUT" - revision = "2ea67817f6a1d08a352c31608f9bd426987acdc0" + revision = "v0.5.1" [[projects]] digest = "1:f995136b53497081f1b3f29b99e78a597da6afb2bc6f22908382559a863df4ea" diff --git a/Gopkg.toml b/Gopkg.toml index 90db699e8..7c420c078 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,6 +1,6 @@ [[constraint]] name = "gopkg.in/src-d/go-mysql-server.v0" - revision = "2ea67817f6a1d08a352c31608f9bd426987acdc0" + revision = "v0.5.1" [[constraint]] name = "github.com/jessevdk/go-flags" diff --git a/docs/using-gitbase/functions.md b/docs/using-gitbase/functions.md index 2bca4362e..229dfcd13 100644 --- a/docs/using-gitbase/functions.md +++ b/docs/using-gitbase/functions.md @@ -95,4 +95,4 @@ Also, if you want to retrieve values from a non common property, you can pass it ## Standard functions -You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/2ea67817f6a1d08a352c31608f9bd426987acdc0#custom-functions). +You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/v0.5.1#custom-functions). diff --git a/docs/using-gitbase/indexes.md b/docs/using-gitbase/indexes.md index 2a54acaf5..7ccc57a07 100644 --- a/docs/using-gitbase/indexes.md +++ b/docs/using-gitbase/indexes.md @@ -26,4 +26,4 @@ and for the second query also two indexes will be used and the result will be a You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section. -See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/2ea67817f6a1d08a352c31608f9bd426987acdc0#indexes) documentation for more details +See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/v0.5.1#indexes) documentation for more details diff --git a/docs/using-gitbase/supported-clients.md b/docs/using-gitbase/supported-clients.md index 55b0645ad..82623007a 100644 --- a/docs/using-gitbase/supported-clients.md +++ b/docs/using-gitbase/supported-clients.md @@ -1,3 +1,3 @@ ## Supported clients -To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/2ea67817f6a1d08a352c31608f9bd426987acdc0/SUPPORTED_CLIENTS.md). +To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/v0.5.1/SUPPORTED_CLIENTS.md). diff --git a/docs/using-gitbase/supported-syntax.md b/docs/using-gitbase/supported-syntax.md index e4eb5f10d..91d88b5b2 100644 --- a/docs/using-gitbase/supported-syntax.md +++ b/docs/using-gitbase/supported-syntax.md @@ -1,3 +1,3 @@ ## Supported syntax -To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/2ea67817f6a1d08a352c31608f9bd426987acdc0/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server). +To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/v0.5.1/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server). diff --git a/vendor/gopkg.in/src-d/go-mysql-server.v0/server/handler.go b/vendor/gopkg.in/src-d/go-mysql-server.v0/server/handler.go index 422a2ac3e..6cc582c58 100644 --- a/vendor/gopkg.in/src-d/go-mysql-server.v0/server/handler.go +++ b/vendor/gopkg.in/src-d/go-mysql-server.v0/server/handler.go @@ -177,7 +177,7 @@ func (h *Handler) handleKill(conn *mysql.Conn, query string) (bool, error) { if s[1] == "query" { logrus.Infof("kill query: id %v", id) - h.e.Catalog.KillConnection(uint32(id)) + h.e.Catalog.Kill(id) } else { logrus.Infof("kill connection: id %v, pid: %v", conn.ConnectionID, id) h.mu.Lock()