Update go-mysql-server dependency

Signed-off-by: Antonio Navarro Perez <[email protected]>

Author: ajnavarro

CHANGELOG.md

@@ -11,13 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Only optimize sorted DISTINCT if the first column on the order by is on the distinct schema. ([#976](https://github.com/src-d/gitbase/issues/976))
 - Removed redundant commit information from BLAME results.
 - Don't abort, just warn, on git.Blame errors.
+<<<<<<< HEAD
 - Avoid possible panics in LOC by using a safe cache accessor.
+=======
+- sql: Add length to VARCHAR MySQLTypeName string
+>>>>>>> Update go-mysql-server dependency
 
 ### Added
 
 - Added BLAME function.
 - Better error messages for index failures.
 - Implemented subquery expressions.
+- Added support for 24-bit integers (MySQL's MEDIUMINT)
 
 ### Changed
 

docs/using-gitbase/supported-syntax.md

@@ -27,7 +27,6 @@
 - ALIAS (AS)
 - CAST/CONVERT
 - CREATE TABLE
-- DESCRIBE/DESC/EXPLAIN [table name]
 - DESCRIBE/DESC/EXPLAIN FORMAT=TREE [query]
 - DISTINCT
 - FILTER (WHERE)

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/src-d/go-borges v0.1.4-0.20191017133700-c26ddd90fcbd
 	github.com/src-d/go-git v4.7.0+incompatible
 	github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
-	github.com/src-d/go-mysql-server v0.6.1-0.20191016135058-b8d91559c9a9
+	github.com/src-d/go-mysql-server v0.6.1-0.20191022072045-6f000e20fb41
 	github.com/stretchr/testify v1.3.0
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible

go.sum

@@ -251,8 +251,8 @@ github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlo
 github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
-github.com/src-d/go-mysql-server v0.6.1-0.20191016135058-b8d91559c9a9 h1:g2gm/Yk+p5yljdqQLAn/thqBtuV5t47GGuVvdKnmmkk=
-github.com/src-d/go-mysql-server v0.6.1-0.20191016135058-b8d91559c9a9/go.mod h1:DdWE0ku/mNfuLsRJIrHeHpDtB7am+6oopxEsQKmVkx8=
+github.com/src-d/go-mysql-server v0.6.1-0.20191022072045-6f000e20fb41 h1:RYuaZLn2FizXyJt7oBcpVcjJwH1p0z9K4sKI6ECUel0=
+github.com/src-d/go-mysql-server v0.6.1-0.20191022072045-6f000e20fb41/go.mod h1:DdWE0ku/mNfuLsRJIrHeHpDtB7am+6oopxEsQKmVkx8=
 github.com/src-d/go-oniguruma v1.0.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=
 github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww=
 github.com/src-d/go-oniguruma v1.1.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM=