Skip to content

Commit

Permalink
Merge pull request #346 from erizocosmico/upgrade/go-mysql-server-a
Browse files Browse the repository at this point in the history
vendor: upgrade go-mysql-server
  • Loading branch information
ajnavarro authored Jun 29, 2018
2 parents 54e69c2 + 16deddc commit ec22a62
Show file tree
Hide file tree
Showing 28 changed files with 2,373 additions and 193 deletions.
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[[constraint]]
name = "gopkg.in/src-d/go-mysql-server.v0"
revision = "0084abf48137b4d72c6f948abfde91a00f3f77f0"
revision = "24a5925748096dd3116b0073833a438ecb0c34f9"

[[constraint]]
name = "github.com/jessevdk/go-flags"
Expand Down
2 changes: 1 addition & 1 deletion docs/using-gitbase/functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ To make some common tasks easier for the user, there are some functions to inter

## Standard functions

You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/5620932d8b3ca58edd6bfa4c168073d4c1ff665f#custom-functions).
You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/24a5925748096dd3116b0073833a438ecb0c34f9#custom-functions).
2 changes: 1 addition & 1 deletion docs/using-gitbase/supported-syntax.md
Original file line number Diff line number Diff line change
@@ -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/5620932d8b3ca58edd6bfa4c168073d4c1ff665f/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/24a5925748096dd3116b0073833a438ecb0c34f9/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
4 changes: 2 additions & 2 deletions integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ func createIndex(
iter, err := data.table.(sql.Indexable).IndexKeyValueIter(ctx, data.columns)
require.NoError(err)

require.NoError(driver.Save(context.Background(), idx, iter))
require.NoError(driver.Save(sql.NewEmptyContext(), idx, iter))

done <- struct{}{}
}
Expand All @@ -748,7 +748,7 @@ func deleteIndex(
data indexData,
) {
t.Helper()
done, err := e.Catalog.DeleteIndex("foo", data.id)
done, err := e.Catalog.DeleteIndex("foo", data.id, true)
require.NoError(t, err)
<-done
}
Expand Down
1 change: 1 addition & 0 deletions vendor/gopkg.in/src-d/go-mysql-server.v0/SUPPORTED.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

126 changes: 79 additions & 47 deletions vendor/gopkg.in/src-d/go-mysql-server.v0/engine_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ec22a62

Please sign in to comment.