From 33042b9f6ad7ac2223e7cbae7cf7bf3184e9e4a9 Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Fri, 12 Jul 2019 16:53:44 +0800 Subject: [PATCH 1/2] parser,ddl: parse and ignore 'PARTITION BY LIST ..." --- ddl/db_test.go | 6 ++++++ go.mod | 2 ++ go.sum | 2 ++ 3 files changed, 10 insertions(+) diff --git a/ddl/db_test.go b/ddl/db_test.go index 51d261f897d03..baece5f3f6319 100644 --- a/ddl/db_test.go +++ b/ddl/db_test.go @@ -2387,6 +2387,12 @@ func (s *testDBSuite) TestCreateTableWithPartition(c *C) { (partition p0 values less than (0));`) s.testErrorCode(c, `create table t31 (a int not null) partition by range( a );`, tmysql.ErrPartitionsMustBeDefined) + + s.tk.MustExec(`create table t (a int) /*!50100 partition by list (a) ( +partition p0 values in (1) ENGINE = InnoDB, +partition p1 values in (29) ENGINE = InnoDB, +partition p2 values in (2) ENGINE = InnoDB, +partition p3 values in (3) ENGINE = InnoDB) */`) } func (s *testDBSuite) TestCreateTableWithHashPartition(c *C) { diff --git a/go.mod b/go.mod index e4ebd6d1b303a..935ead5aa0cfd 100644 --- a/go.mod +++ b/go.mod @@ -84,3 +84,5 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) + +replace github.com/pingcap/parser => github.com/tiancaiamao/parser v0.0.0-20190712084806-7f2d6bd7a4a1 diff --git a/go.sum b/go.sum index 417b4a830e5c4..78b1556658e95 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,8 @@ github.com/spaolacci/murmur3 v0.0.0-20150829172844-0d12bf811670/go.mod h1:JwIasO github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/tiancaiamao/parser v0.0.0-20190712084806-7f2d6bd7a4a1 h1:Ej+SuAWCeXYD0fsPbE2IAglM74euXwlp/s+AfhoaTDQ= +github.com/tiancaiamao/parser v0.0.0-20190712084806-7f2d6bd7a4a1/go.mod h1:vqvanuOAAZ9O2rVI51fUrA9P3nV7HoILjLby0/OKOqA= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twinj/uuid v0.0.0-20150629100731-70cac2bcd273 h1:YqFyfcgqxQqjpRr0SEG0Z555J/3kPqDL/xmRyeAaX/0= From 0bddd5d311feeaf3b6024f7269fbbd21dca4a5fb Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Thu, 18 Jul 2019 11:13:25 +0800 Subject: [PATCH 2/2] update go.mod --- go.mod | 4 +--- go.sum | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 935ead5aa0cfd..d6c7a3e1fb0ad 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/pingcap/goleveldb v0.0.0-20171020084629-8d44bfdf1030 github.com/pingcap/kvproto v0.0.0-20190429124202-32a5ba2af0f7 github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596 - github.com/pingcap/parser v0.0.0-20190703021824-628683061f71 + github.com/pingcap/parser v0.0.0-20190718031118-20e37a65d718 github.com/pingcap/pd v2.1.12+incompatible github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible github.com/pingcap/tipb v0.0.0-20180910045846-371b48b15d93 @@ -84,5 +84,3 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) - -replace github.com/pingcap/parser => github.com/tiancaiamao/parser v0.0.0-20190712084806-7f2d6bd7a4a1 diff --git a/go.sum b/go.sum index 78b1556658e95..58087f45a61cd 100644 --- a/go.sum +++ b/go.sum @@ -111,6 +111,8 @@ github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596 h1:t2OQTpPJnrPDGlvA+3F github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596/go.mod h1:WpHUKhNZ18v116SvGrmjkA9CBhYmuUTKL+p8JC9ANEw= github.com/pingcap/parser v0.0.0-20190703021824-628683061f71 h1:ErX0Ww42LBHTSlK2Q8f8/86CUEg+dUpeyYbMt0iNxkg= github.com/pingcap/parser v0.0.0-20190703021824-628683061f71/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA= +github.com/pingcap/parser v0.0.0-20190718031118-20e37a65d718 h1:raZFhem9Ga8BcuWhQ6daejp5E5rIeyET0oQddyWK2Q0= +github.com/pingcap/parser v0.0.0-20190718031118-20e37a65d718/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA= github.com/pingcap/pd v2.1.12+incompatible h1:6N3LBxx2aSZqT+IWEG730EDNDttP7dXO8J6yvBh+HXw= github.com/pingcap/pd v2.1.12+incompatible/go.mod h1:nD3+EoYes4+aNNODO99ES59V83MZSI+dFbhyr667a0E= github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible h1:e9Gi/LP9181HT3gBfSOeSBA+5JfemuE4aEAhqNgoE4k=