Skip to content

Commit 157eb71

Browse files
authored
Merge pull request #383 from erizocosmico/upgrade/go-mysql-server-b
vendor: upgrade go-mysql-server
2 parents c3bdc81 + 36cac2a commit 157eb71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+5435
-4953
lines changed

Gopkg.lock

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[constraint]]
22
name = "gopkg.in/src-d/go-mysql-server.v0"
3-
revision = "9c3b77f244b0909fed15a669be2cdeb355462a7d"
3+
revision = "7315c025d453dc5a696449b15fb0cc5aa5f9b46a"
44

55
[[constraint]]
66
name = "github.com/jessevdk/go-flags"

cmd/gitbase/command/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (c *Server) buildDatabase() error {
137137
ab = ab.ReadOnly()
138138
}
139139
a := ab.Build()
140-
c.engine = sqle.New(catalog, a)
140+
c.engine = sqle.New(catalog, a, version)
141141
}
142142

143143
c.pool = gitbase.NewRepositoryPool()

integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ func newSquashEngine() *sqle.Engine {
736736
analyzer := analyzer.NewBuilder(catalog).
737737
AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins).
738738
Build()
739-
e := sqle.New(catalog, analyzer)
739+
e := sqle.New(catalog, analyzer, "test")
740740
e.AddDatabase(gitbase.NewDatabase("foo"))
741741
e.Catalog.RegisterFunctions(sqlfunction.Defaults)
742742
e.Catalog.RegisterFunctions(function.Functions)

vendor/gopkg.in/src-d/go-errors.v0/.gitignore

Lines changed: 0 additions & 24 deletions
This file was deleted.

vendor/gopkg.in/src-d/go-errors.v0/.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

vendor/gopkg.in/src-d/go-errors.v0/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

vendor/gopkg.in/src-d/go-errors.v0/Makefile

Lines changed: 0 additions & 16 deletions
This file was deleted.

vendor/gopkg.in/src-d/go-errors.v0/error.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

vendor/gopkg.in/src-d/go-errors.v0/error_test.go

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)