29369dba8f
*: Rename mysqldef to mysql
2015-10-19 16:26:43 +08:00
dac7b00e9e
Merge branch 'master' into qiuyesuifeng/date_add_func
2015-10-19 14:35:23 +08:00
1da15de1fe
*: address comments.
2015-10-19 14:33:37 +08:00
422fc2ef06
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
2015-10-19 10:51:55 +08:00
6c540d6279
*: Fix issue 393
...
See: https://github.com/pingcap/tidb/issues/393
2015-10-17 17:09:29 +08:00
486089f450
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
stmt/stmts/account_manage.go
2015-10-16 14:24:11 +08:00
1d7a14f355
*: address comments.
2015-10-15 23:14:36 +08:00
1466a477ae
parser: fix issue#340 and add test
2015-10-15 19:57:16 +08:00
7ef47ddd1f
Merge pull request #1 from pingcap/master
...
Merge pull request from pingcap/tidb
2015-10-15 16:07:37 +08:00
a4aa3e72e6
parser/parser.y: add StringType OptCharset OptCollate support
...
to support sql like "Create Table test(a CHAR(10) CHARACTER SET utf8)", see details:
"https://dev.mysql.com/doc/refman/5.0/en/create-table.html ",
data_type:
...
| CHAR[(length)] [BINARY]
[CHARACTER SET charset_name] [COLLATE collation_name]
2015-10-15 15:49:29 +08:00
3fab6c405f
Merge pull request #389 from pingcap/coocood/ast
...
ast: Initial implementation of abstract syntax tree.
2015-10-15 15:37:43 +08:00
d50b6c5fcc
*: Fix hibernate bug about col.Flen/Decimal
2015-10-13 18:11:11 +08:00
ff8546a539
parser: add parser test.
2015-10-13 16:40:10 +08:00
14c210bbed
parser: add add_date parser support.
2015-10-13 16:39:47 +08:00
eab269c85b
Merge pull request #370 from pingcap/shenli/parser-cleanup
...
parser: Tiny cleanup
2015-10-13 10:54:13 +08:00
33016df971
Merge pull request #360 from pingcap/siddontang/like-escape
...
support like escape
2015-10-13 10:47:57 +08:00
343ffede79
parser: Tiny cleanup
2015-10-13 10:45:24 +08:00
8fec2e463d
Merge pull request #350 from pingcap/sheni/issue-320
...
*: SubSelect can be used as select statement
2015-10-13 10:33:37 +08:00
213b0b9ab8
parser: Address comment
2015-10-13 10:12:04 +08:00
0f2a4b1be2
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
parser/parser.y
parser/scanner.l
2015-10-13 10:09:11 +08:00
41beb10280
Merge pull request #361 from pingcap/shenli/parser-cleanup
...
parser: Change Factor1 to a meaningful name
2015-10-12 22:25:15 +08:00
d594fd83d4
Merge pull request #354 from pingcap/siddontang/update-field-name
...
update field name
2015-10-12 21:49:22 +08:00
a9cc7c0321
parser: Change Factor1 to a meaningful name
2015-10-12 17:44:43 +08:00
6c9cf0690a
parser: add test
2015-10-12 17:37:49 +08:00
001a9f923d
*: merge master and fix conflict
2015-10-12 17:36:31 +08:00
320dca9fb8
parser: fix S/R conflict.
2015-10-12 17:29:26 +08:00
d030c386eb
Merge pull request #348 from pingcap/qiuyesuifeng/tiny-clean-up-packages
...
Tiny clean up packages.
2015-10-12 16:00:04 +08:00
d121489be0
last, optimiser: add package ast and optimizer.
2015-10-12 14:27:10 +08:00
abe94aa2ba
parser: Solve merge problem
2015-10-12 13:35:01 +08:00
5e56f52810
Merge remote-tracking branch 'origin/master' into sheni/issue-320
...
Conflicts:
parser/parser_test.go
2015-10-12 13:29:49 +08:00
3c98e2f359
Merge remote-tracking branch 'origin/master' into shenli/trim
...
Conflicts:
parser/parser_test.go
2015-10-12 11:43:12 +08:00
dec67d7ee5
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
parser/parser_test.go
2015-10-12 11:30:17 +08:00
dc5e31c754
parser: Address comment
2015-10-12 11:18:09 +08:00
13051f54f5
parser: Address commment
2015-10-12 11:07:34 +08:00
1661b650fa
parser: Split parser test cases
...
Avoid pr conflict
2015-10-12 10:59:04 +08:00
742f8ff3b7
parser: remove unnecessary code.
2015-10-12 10:17:11 +08:00
df24051cbf
*: Merge branch 'master' into siddontang/update-field-name
2015-10-12 10:09:09 +08:00
d32e4f5153
*: support like escape
2015-10-12 09:56:52 +08:00
ee5bbd0de1
*: Check float length in parser
...
Fix https://github.com/pingcap/tidb/issues/312
2015-10-11 15:53:35 +08:00
4e3b9bafe9
*: SubSelect can be used as select statement
...
Fix https://github.com/pingcap/tidb/issues/320
2015-10-11 15:21:43 +08:00
efb7bdf151
Merge branch 'master' into qiuyesuifeng/tiny-clean-up-packages
2015-10-10 19:43:53 +08:00
32821500b7
Merge pull request #342 from pingcap/shenli/show-where-like
...
*: Support like/where clause in show tables statement.
2015-10-10 16:00:27 +08:00
38abb35769
*: Support trim function
...
See: https://dev.mysql.com/doc/refman/5.7/en/string-functions.html#function_trim
2015-10-10 14:57:40 +08:00
104d30ccb8
*: Support like/where clause in show tables statement.
...
Fix https://github.com/pingcap/tidb/issues/339
2015-10-10 11:47:41 +08:00
a3f17ab8f7
*: merge master and fix conflict.
2015-10-10 10:53:08 +08:00
df66eaba45
*: refactor field as name
2015-10-10 10:46:29 +08:00
e9433e5098
Merge pull request #338 from pingcap/siddontang/update-as
...
parser: update as option
2015-10-10 09:56:32 +08:00
ebe12aa2da
Merge remote-tracking branch 'origin/master' into shenli/locate
2015-10-09 23:19:42 +08:00
135e2c0591
*: Address comments
2015-10-09 22:52:22 +08:00
7873ff1a1c
Merge branch 'master' into qiuyesuifeng/tiny-clean-up-packages
2015-10-09 19:16:48 +08:00
