Commit Graph

289 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
741b39ef32 *: Address comment 2015-11-11 17:17:27 +08:00
f09f61a79c *: Add some unit tests 2015-11-11 11:34:13 +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
xia
b98b6920b9 *: add comments 2015-11-06 21:23:11 +08:00
xia
5ce49e128d *: add test 2015-11-06 17:33:05 +08:00
xia
c173e20814 parser: support adddate or subdate function with days form 2015-11-06 17:32:18 +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
ba5a6b806a parser: Address comment 2015-10-30 22:59:29 +08:00
b6ee1409fb *: Address comments 2015-10-30 19:07:44 +08:00
xia
480f7f358c *: use a const int value instead of string 2015-10-30 14:50:12 +08:00
xia
414ae7b732 *: rename DateCast to DateArith 2015-10-30 13:30:44 +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
c49e04eee1 parser: add date_sub function test 2015-10-29 20:34:30 +08:00
xia
77f8b4e4da parser: add date_sub function 2015-10-29 20:34:01 +08:00
xia
da556cbaa4 *: unify expression.Assignment in parser 2015-10-29 14:24:37 +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
5b0ce49cb4 Merge pull request #459 from pingcap/zimuxia/drop_tables
parser: Support drop tables
2015-10-27 19:01:26 +08:00
xia
3c153c05ad parser: rename DropTableOpt to TableOrTables 2015-10-27 17:46:08 +08:00
xia
f2ac5f7353 parser: support drop tables and add test 2015-10-27 16:54:24 +08:00
xia
4f92173267 *: rename InsertRest to InsertValues and add TODOs 2015-10-27 13:21:35 +08:00
xia
5a42db1ea4 *: rename getSetlist to fillValueList and add the InsertRest structure
to make the code more clear
2015-10-26 18:14:51 +08:00
ebfb3377c8 *: Address comment and code cleanup 2015-10-26 15:06:08 +08:00
xia
f5f4b223a5 *: Update format. 2015-10-26 10:48:22 +08:00
xia
36a60807cb stmt: rename addRecord to getRow and rename SetList to Setlist 2015-10-23 20:31:14 +08:00
10d90f2637 *: parser returns DataItem for stringLiteral instead of raw string. 2015-10-23 11:36: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
5e9042b47a parser: add test of parsing replace statment 2015-10-22 14:45:54 +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
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
xia
1466a477ae parser: fix issue#340 and add test 2015-10-15 19:57:16 +08:00