diff --git a/go/go.mod b/go/go.mod
index 34ac1dad17..492d07cf11 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/dolthub/fslock v0.0.3
 	github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20230508201056-fc3ee4c11ca5
+	github.com/dolthub/vitess v0.0.0-20230518175744-593ce40efc46
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.13.0
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -59,7 +59,7 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/creasty/defaults v1.6.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.15.1-0.20230517201855-8477b3b02370
+	github.com/dolthub/go-mysql-server v0.15.1-0.20230523172851-5ecfc1bc2af0
 	github.com/dolthub/swiss v0.1.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/jmoiron/sqlx v1.3.4
diff --git a/go/go.sum b/go/go.sum
index e0f1c4cd31..6f3e3093f1 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -168,8 +168,8 @@ 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-icu-regex v0.0.0-20230516121657-5424676dd4ac h1:/bsG4AyV5MesUPw7LSkxHKMsP9f+LSLrsMbBxLP6+Mk=
 github.com/dolthub/go-icu-regex v0.0.0-20230516121657-5424676dd4ac/go.mod h1:xLKpPutKiF9FxxcLG3gf/JA95YZQNAqBegkDRe1AZF4=
-github.com/dolthub/go-mysql-server v0.15.1-0.20230517201855-8477b3b02370 h1:YGNpsPKq7u5cAow/5Sjb3ncu5Qh6SwCp5jBBMhtCnRs=
-github.com/dolthub/go-mysql-server v0.15.1-0.20230517201855-8477b3b02370/go.mod h1:J+NMF5CgU6b3tBI4G2QVb1AUSf+YoPDDCsZkcM7rY1I=
+github.com/dolthub/go-mysql-server v0.15.1-0.20230523172851-5ecfc1bc2af0 h1:UGMgP9QkOW3kk566+307dZSHAOyDk0jt/AEu1liWOfs=
+github.com/dolthub/go-mysql-server v0.15.1-0.20230523172851-5ecfc1bc2af0/go.mod h1:QtEmore89AqJ0j039nSXGKpOUbzx9+LRuwrnfd4sua8=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
 github.com/dolthub/jsonpath v0.0.1 h1:Nd+T3U+XisK3kOuxtABS5IIbZqXVIlOR9VYquyjQ0u0=
@@ -180,8 +180,10 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
 github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc=
 github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ=
-github.com/dolthub/vitess v0.0.0-20230508201056-fc3ee4c11ca5 h1:Odi5ZtzgfS3B6MEwe5c5ADV70pjdnI3jbWr9XI5/vfg=
-github.com/dolthub/vitess v0.0.0-20230508201056-fc3ee4c11ca5/go.mod h1:IyoysiiOzrIs7QsEHC+yVF0yRQ6W70GXyCXqtI2vVTs=
+github.com/dolthub/vitess v0.0.0-20230518120917-a3e13f1a546a h1:KnNvaz8GaUvMm+jvm11nGVlpR2lGaKQfWU4yaXLA4yg=
+github.com/dolthub/vitess v0.0.0-20230518120917-a3e13f1a546a/go.mod h1:IyoysiiOzrIs7QsEHC+yVF0yRQ6W70GXyCXqtI2vVTs=
+github.com/dolthub/vitess v0.0.0-20230518175744-593ce40efc46 h1:movGsPpisW7QkZRCG34IqEC7MsBAjaAoMXJshuAQZPA=
+github.com/dolthub/vitess v0.0.0-20230518175744-593ce40efc46/go.mod h1:IyoysiiOzrIs7QsEHC+yVF0yRQ6W70GXyCXqtI2vVTs=
 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=
diff --git a/integration-tests/bats/sql-spatial-types.bats b/integration-tests/bats/sql-spatial-types.bats
index 5db6aa02ac..2268698ca3 100644
--- a/integration-tests/bats/sql-spatial-types.bats
+++ b/integration-tests/bats/sql-spatial-types.bats
@@ -164,13 +164,13 @@ teardown() {
 @test "sql-spatial-types: SRID defined in column definition in CREATE TABLE" {
     run dolt sql -q "CREATE TABLE pt (i int primary key, p POINT NOT NULL SRID 1)"
     [ "$status" -eq 1 ]
-    [[ "$output" =~ "unsupported feature: unsupported SRID value" ]] || false
+    [[ "$output" =~ "There's no spatial reference with SRID 1" ]] || false
 
     run dolt sql -q "CREATE TABLE pt (i int primary key, p POINT NOT NULL SRID 0)"
     [ "$status" -eq 0 ]
 
     run dolt sql -q "SHOW CREATE TABLE pt"
-    [[ "$output" =~ "\`p\` point NOT NULL SRID 0" ]] || false
+    [[ "$output" =~ "\`p\` point NOT NULL /*!80003 SRID 0 */" ]] || false
 
     dolt sql -q "INSERT INTO pt VALUES (1, POINT(5,6))"
     run dolt sql -q "SELECT ST_ASWKT(p) FROM pt"
@@ -203,7 +203,7 @@ SQL
     [ "$status" -eq 0 ]
 
     run dolt sql -q "SHOW CREATE TABLE table1"
-    [[ "$output" =~ "\`p\` geometry NOT NULL SRID 4326" ]] || false
+    [[ "$output" =~ "\`p\` geometry NOT NULL /*!80003 SRID 4326 */" ]] || false
 
     run dolt sql -q "SELECT ST_ASWKT(p) FROM table1"
     [[ "$output" =~ "LINESTRING(0 0,1 2)" ]] || false
diff --git a/integration-tests/data-dump-loading-tests/import-mysqldump.bats b/integration-tests/data-dump-loading-tests/import-mysqldump.bats
index 8156c44b88..13dc1668c3 100644
--- a/integration-tests/data-dump-loading-tests/import-mysqldump.bats
+++ b/integration-tests/data-dump-loading-tests/import-mysqldump.bats
@@ -479,7 +479,7 @@ SQL
 
     run dolt sql -q "show create table address;" -r csv
     [ "$status" -eq 0 ]
-    [[ "$output" =~ "\`location\` geometry NOT NULL SRID 0," ]] || false
+    [[ "$output" =~ "\`location\` geometry NOT NULL /*!80003 SRID 0 */," ]] || false
 }
 
 @test "import mysqldump: dolt dump --no-autocommit can be loaded back into mysql" {