From 69e8b4263a641f5bbb9ae2fb3ff823b8f735439e Mon Sep 17 00:00:00 2001
From: Zach Musgrave <zach@dolthub.com>
Date: Mon, 16 May 2022 13:10:16 -0700
Subject: [PATCH] Upgrade gms, fix constant package

---
 go/cmd/dolt/commands/sqlserver/logformat.go | 6 +++---
 go/go.mod                                   | 4 ++--
 go/go.sum                                   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/go/cmd/dolt/commands/sqlserver/logformat.go b/go/cmd/dolt/commands/sqlserver/logformat.go
index 50dbe03688..2be31d461f 100755
--- a/go/cmd/dolt/commands/sqlserver/logformat.go
+++ b/go/cmd/dolt/commands/sqlserver/logformat.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	sqle "github.com/dolthub/go-mysql-server"
+	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/sirupsen/logrus"
 )
 
@@ -45,8 +45,8 @@ func (l LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
 		lvl = "TRACE"
 	}
 
-	connectionId := entry.Data[sqle.ConnectionIdLogField]
-	delete(entry.Data, sqle.ConnectionIdLogField)
+	connectionId := entry.Data[sql.ConnectionIdLogField]
+	delete(entry.Data, sql.ConnectionIdLogField)
 
 	var dataFormat strings.Builder
 	var i int
diff --git a/go/go.mod b/go/go.mod
index dc9d256d8d..1ea6d07e3d 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371
 	github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20220504220708-70dd916eb224
+	github.com/dolthub/vitess v0.0.0-20220506214606-1a0fb4aab742
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.9.0
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -68,7 +68,7 @@ require (
 )
 
 require (
-	github.com/dolthub/go-mysql-server v0.11.1-0.20220506170120-0e751797bad0
+	github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f
 	github.com/google/flatbuffers v2.0.5+incompatible
 	github.com/gosuri/uilive v0.0.4
 	github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
diff --git a/go/go.sum b/go/go.sum
index 162f72765d..f26cd0e68a 100755
--- a/go/go.sum
+++ b/go/go.sum
@@ -178,8 +178,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
-github.com/dolthub/go-mysql-server v0.11.1-0.20220506170120-0e751797bad0 h1:RageQKB4A8oy3Tqm8gAcYoRgkJrA0IDI0jmWaRJChck=
-github.com/dolthub/go-mysql-server v0.11.1-0.20220506170120-0e751797bad0/go.mod h1:BtzF5ATKAVYM3d+OOe1oHy4xBx2x8BPMSpzPol7CDIc=
+github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f h1:5qWNfqLHb15Rw30XzcVPAYbRXserHx7wCQG41+MrN14=
+github.com/dolthub/go-mysql-server v0.11.1-0.20220516200813-de091948f14f/go.mod h1:jfc/rO3guNfSQbyElNepEHBZ4rO3AaxKk9LMhDZa09I=
 github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g=
 github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
 github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=
@@ -188,8 +188,8 @@ github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxP
 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66/go.mod h1:N5ZIbMGuDUpTpOFQ7HcsN6WSIpTGQjHP+Mz27AfmAgk=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20220504220708-70dd916eb224 h1:cjqtjhShlo0CD0BuEr0NuVxtd+0dwfZnM9w4ckPjWdk=
-github.com/dolthub/vitess v0.0.0-20220504220708-70dd916eb224/go.mod h1:jxgvpEvrTNw2i4BKlwT75E775eUXBeMv5MPeQkIb9zI=
+github.com/dolthub/vitess v0.0.0-20220506214606-1a0fb4aab742 h1:hlRT6htzhXA2CBfsQrXb24aUkT4JTJVMcD+RPCzGrmY=
+github.com/dolthub/vitess v0.0.0-20220506214606-1a0fb4aab742/go.mod h1:jxgvpEvrTNw2i4BKlwT75E775eUXBeMv5MPeQkIb9zI=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=