Commit Graph

95 Commits

Author SHA1 Message Date
7daf2e92e2 Merge remote-tracking branch 'origin/master' into shenli/mysqldump
Conflicts:
	parser/scanner.l
2015-11-11 17:19:01 +08:00
9203fa4a70 *: Fix mysqldump import data problems 2015-11-11 00:45:58 +08:00
ea0953b328 Merge master and pass mysqldump dump data 2015-11-11 00:36:10 +08:00
xia
415085546b Merge branch 'master' into zimuxia/issue525
Conflicts:
	expression/variable.go
	parser/scanner.l
	plan/plans/show.go
	plan/plans/show_test.go
	stmt/stmts/set.go
2015-11-09 20:22:05 +08:00
xia
784e7a1218 parser: support show status statement and add test. 2015-11-09 19:37:20 +08:00
df1caf0f54 parser: add test cases and use unicode function. 2015-11-09 15:01:36 +08:00
a1417b0bf4 parser: set exactly the same field text as MySQL. 2015-11-09 14:04:35 +08:00
275d4cf3f8 *: Add some sql syntax to prevent mysqldump
Support lock/unlock/show table status
2015-11-06 15:59:06 +08:00
xia
6a799bfbd8 parser: support ADDDATE and SUBDATE function
Conflicts:
	parser/parser.y
2015-11-05 17:26:05 +08:00
88711021e8 parser: address comment. 2015-11-05 16:13:29 +08:00
b24f320d55 parser: remove old parser and move ast/parser to /parser. 2015-11-05 16:03:26 +08:00
c49df394e1 Merge pull request #485 from pingcap/zimuxia/date-sub
Support date_sub function
2015-11-03 09:46:27 +08:00
3871b0afbd *: Support character string literal
See: https://dev.mysql.com/doc/refman/5.7/en/charset-literal.html
2015-10-30 12:21:57 +08:00
a6f146564e Merge pull request #473 from pingcap/shenli/show-grants
Shenli/show grants
2015-10-30 08:46:57 +08:00
xia
77f8b4e4da parser: add date_sub function 2015-10-29 20:34:01 +08:00
xia
d48ac8ca26 Merge branch 'master' into zimuxia/replace-func 2015-10-28 17:53:50 +08:00
xia
935cc8bd52 parser: add replace func 2015-10-28 17:51:18 +08:00
628922ae35 Merge pull request #439 from pingcap/shenli/string-literal
Shenli/string literal
2015-10-28 14:54:51 +08:00
09b66390cf *: Support show grants syntax and add ShowGrant interface to UserPrivileges 2015-10-27 22:01:07 +08:00
3c28357b09 *: Pass context to Compile()
Compile should know context to get current charset info.
2015-10-22 17:09:53 +08:00
xia
e26875e88c parser: add parse replace statment 2015-10-22 14:43:09 +08:00
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
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
3fab6c405f Merge pull request #389 from pingcap/coocood/ast
ast: Initial implementation of abstract syntax tree.
2015-10-15 15:37:43 +08:00
14c210bbed parser: add add_date parser support. 2015-10-13 16:39:47 +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
001a9f923d *: merge master and fix conflict 2015-10-12 17:36:31 +08:00
d121489be0 last, optimiser: add package ast and optimizer. 2015-10-12 14:27:10 +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
d32e4f5153 *: support like escape 2015-10-12 09:56:52 +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
a3f17ab8f7 *: merge master and fix conflict. 2015-10-10 10:53:08 +08:00
ebe12aa2da Merge remote-tracking branch 'origin/master' into shenli/locate 2015-10-09 23:19:42 +08:00
f8361752aa parser: support extract time function 2015-10-09 10:13:05 +08:00
0bc684868f *: Support locate function
See: https://dev.mysql.com/doc/refman/5.7/en/string-functions.html#function_locate
2015-10-08 16:26:15 +08:00
be58e070a3 parser: support current date 2015-10-08 16:00:37 +08:00
3c69db4ce3 parser: Support dollar in identifier 2015-10-08 14:36:53 +08:00
f9e6cd87d6 Merge pull request #314 from pingcap/siddontang/string-function
update string function
2015-10-07 13:10:48 +08:00
cd612c05b6 parser: support lower and parser 2015-10-07 12:03:09 +08:00
c1affab3c4 Introduce a new pretty way to handle subselect 2015-10-07 11:44:13 +08:00
2eb08c0033 Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2 2015-10-02 15:37:04 +08:00
f1423500d3 *: Finish grant global privilege and add uinttest 2015-09-30 17:08:43 +08:00
dffe013e79 parser: update identifier quote 2015-09-30 10:34:35 +08:00
597b5c56b3 parser: fix select '\'a\''; parse bug 2015-09-29 16:50:29 +08:00
e5024e911e parser: add rand function parser support. 2015-09-28 18:37:56 +08:00
3634a953d5 parser: support check expression in create table
nothin to do now
2015-09-28 16:57:47 +08:00
0be33b5918 parser: support national parser
nothing to do now
2015-09-28 16:11:24 +08:00