Skip to content

Commit 8283260

Browse files
authored
Merge pull request #398 from erizocosmico/upgrade/go-mysql-server-c
vendor: upgrade go-mysql-server
2 parents b7637a3 + 7375cac commit 8283260

Some content is hidden

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

52 files changed

+3182
-864
lines changed

Gopkg.lock

Lines changed: 169 additions & 22 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 = "7315c025d453dc5a696449b15fb0cc5aa5f9b46a"
3+
revision = "2e4b54b19076341391a5e8c5a242e548fc76cfb2"
44

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

cmd/gitbase/command/server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ func (c *Server) buildDatabase() error {
139139
ab = ab.ReadOnly()
140140
}
141141
a := ab.Build()
142-
c.engine = sqle.New(catalog, a, c.Version)
142+
c.engine = sqle.New(catalog, a, &sqle.Config{
143+
VersionPostfix: c.Version,
144+
})
143145
}
144146

145147
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, "test")
739+
e := sqle.New(catalog, analyzer, &sqle.Config{VersionPostfix: "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-mysql-server.v0/.travis.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/src-d/go-mysql-server.v0/README.md

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

vendor/gopkg.in/src-d/go-mysql-server.v0/benchmark/tpc_h_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/gopkg.in/src-d/go-mysql-server.v0/engine.go

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

0 commit comments

Comments
 (0)