diff --git a/go/go.mod b/go/go.mod
index 56252d71d2..35481ff984 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -18,11 +18,11 @@ require (
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078
 	github.com/dolthub/fslock v0.0.2
-	github.com/dolthub/go-mysql-server v0.8.1-0.20210316205232-e9973a80dbfe
+	github.com/dolthub/go-mysql-server v0.8.1-0.20210318235349-0703523a75c1
 	github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446
 	github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66
 	github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c
-	github.com/dolthub/vitess v0.0.0-20210316150645-9bf20be78424
+	github.com/dolthub/vitess v0.0.0-20210317175908-b2663b2c4d9c
 	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
diff --git a/go/go.sum b/go/go.sum
index b57f2c17c8..97ac75453d 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -148,16 +148,16 @@ 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.2 h1:8vUh47iKovgrtXNrXVIzsIoWLlspoXg+3nslhUzgKSw=
 github.com/dolthub/fslock v0.0.2/go.mod h1:0i7bsNkK+XHwFL3dIsSWeXSV7sykVzzVr6+jq8oeEo0=
-github.com/dolthub/go-mysql-server v0.8.1-0.20210316205232-e9973a80dbfe h1:IxGrTvChNo7rEQH5Nm0lEGetgsxSpWCZzurpXgTcakk=
-github.com/dolthub/go-mysql-server v0.8.1-0.20210316205232-e9973a80dbfe/go.mod h1:9H9850aJ9b1jmFNGIS9J2uAr6uApsHUzFZeQpb7+iA8=
+github.com/dolthub/go-mysql-server v0.8.1-0.20210318235349-0703523a75c1 h1:AxhoATT5C8w9MHJX4nG1GtyyjAGblx8Xvpp7r7GESxw=
+github.com/dolthub/go-mysql-server v0.8.1-0.20210318235349-0703523a75c1/go.mod h1:hOD66EJ7OUqJHEkbiAtv5UNQIicu6h6T6n9jMcEmTyI=
 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 h1:0ol5pj+QlKUKAtqs1LiPM3ZJKs+rHPgLSsMXmhTrCAM=
 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxPmiuOTndT+lUWUeGjx6eoNOK9O4tQQQ=
 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66/go.mod h1:N5ZIbMGuDUpTpOFQ7HcsN6WSIpTGQjHP+Mz27AfmAgk=
 github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c h1:ZIo6IOXU3/rJK4lp83QRq1zGhQrjQQtlmE2b7H1Vv/k=
 github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20210316150645-9bf20be78424 h1:QGVknlmy9WZoTOTyC50W+HCho7t3/CrpMxJZm+tQ25A=
-github.com/dolthub/vitess v0.0.0-20210316150645-9bf20be78424/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM=
+github.com/dolthub/vitess v0.0.0-20210317175908-b2663b2c4d9c h1:u/hKK5EBh+FJlZlcMjSYLB9qXTG+pnyaa6Vww8sSHvY=
+github.com/dolthub/vitess v0.0.0-20210317175908-b2663b2c4d9c/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM=
 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/go/libraries/doltcore/sqle/sqlselect_test.go b/go/libraries/doltcore/sqle/sqlselect_test.go
index e18cabd74f..c692cb1a27 100644
--- a/go/libraries/doltcore/sqle/sqlselect_test.go
+++ b/go/libraries/doltcore/sqle/sqlselect_test.go
@@ -433,7 +433,7 @@ var BasicSelectTests = []SelectTest{
 		Query:        "select is_married and age >= 40 from people where last_name = 'Simpson' order by id limit 2",
 		ExpectedRows: []sql.Row{{true}, {false}},
 		ExpectedSqlSchema: sql.Schema{
-			&sql.Column{Name: "people.is_married AND people.age >= 40", Type: sql.Int8},
+			&sql.Column{Name: "is_married and age >= 40", Type: sql.Int8},
 		},
 	},
 	{
@@ -574,7 +574,6 @@ var BasicSelectTests = []SelectTest{
 		Name:            "duplicate table selection",
 		Query:           "select first_name as f, last_name as f from people, people where age >= 40",
 		ExpectedErr:     "Non-unique table name / alias: people",
-		SkipOnSqlEngine: true, // this should be an error (table name selected twice without an alias)
 	},
 	{
 		Name:        "duplicate table alias",