Commit Graph

20 Commits

Author SHA1 Message Date
301ea1c93a *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-13 09:41:12 +08:00
542bfebd36 *: merge master and fix conflict. 2015-11-12 10:21:50 +08:00
7daf2e92e2 Merge remote-tracking branch 'origin/master' into shenli/mysqldump
Conflicts:
	parser/scanner.l
2015-11-11 17:19:01 +08:00
ea0953b328 Merge master and pass mysqldump dump data 2015-11-11 00:36:10 +08:00
2f334fc652 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-10 14:36:37 +08:00
8fc82bea9b *: support drop index statement. 2015-11-10 14:27:57 +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
23a7e88f0d *: support ast 2015-11-09 19:51:35 +08:00
a1417b0bf4 parser: set exactly the same field text as MySQL. 2015-11-09 14:04:35 +08:00
6b8a39523f ast/parser: add tests and fix bugs. 2015-11-03 13:53:46 +08:00
5ca94b542e optimizer: add comments for set field text. 2015-11-03 11:18:34 +08:00
53a11459c2 optimizer: only set old field AsName when it is not identifier 2015-11-03 10:28:33 +08:00
ba9dfc3551 ast/parser: add text to select field. 2015-11-03 10:00:17 +08:00
067df3ab34 optimizer: fix wildcard conversion. 2015-11-02 18:37:49 +08:00
ab2ec90d93 ast/parser, optimizer: fix duplicate parameter marker, fix offset. 2015-11-02 13:34:04 +08:00
05b7eefa03 ast: update after rebase. 2015-10-30 20:51:36 +08:00
8f53419016 optimizer: fix bugs, pass tests. 2015-10-30 14:41:43 +08:00
7c7473969f tidb: switch to use ast parser. 2015-10-30 14:41:43 +08:00
edcbbc84ff optimizer: implement ddl statement convert functions. 2015-10-30 14:41:43 +08:00
f3e45697de optimiser: convert to old statement and expression. 2015-10-30 14:41:43 +08:00