Commit Graph

191 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
9c711296c1 Merge pull request #551 from pingcap/zimuxia/issue525
*: Support show status statement
2015-11-11 16:38:12 +08:00
ea0953b328 Merge master and pass mysqldump dump data 2015-11-11 00:36:10 +08:00
930729a058 Merge branch 'master' into qiuyesuifeng/more-schema-test and fix
conflict.
2015-11-10 17:44:18 +08:00
969ec27c71 Merge pull request #563 from pingcap/shenli/issue-557
*: Move privilege checking from ddl to stmts
2015-11-10 17:43:18 +08:00
d169c08b6f *: Move privilege checking from ddl to stmts
Make ddl.go clean
2015-11-10 17:20:28 +08:00
99212f39fe *: tiny refactor remove record. 2015-11-10 17:16:29 +08:00
4deb07d367 stmts: fix test panic. 2015-11-10 14:51:34 +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
f35ec29b6c *: rename GlobalSysVarAccessor to GlobalVarAccessor,
use GetSysVar and GetStatusVar.
2015-11-09 20:02:49 +08:00
7d49f39f2e *: Use Bind/Get global sysvar accessor instead of type assertion 2015-11-09 13:02:30 +08:00
a21673dff3 *: merge master and fix conflict. 2015-11-06 16:33:50 +08:00
275d4cf3f8 *: Add some sql syntax to prevent mysqldump
Support lock/unlock/show table status
2015-11-06 15:59:06 +08:00
afe2c8dee3 Merge branch 'master' into coocood/use-terror 2015-11-05 19:21:00 +08:00
38726769b4 terror: new implementation. 2015-11-05 19:15:49 +08:00
89fa72467c Merge pull request #491 from pingcap/coocood/binder
ast,optimizer: switch to use new parser, and convert ast.Node to old statements.
2015-11-05 15:38:31 +08:00
229ae62876 *: merge master and fix conflict 2015-11-05 15:02:17 +08:00
0943aa598e terror: unify util/errors and util/errors2 in terror. 2015-11-05 12:05:16 +08:00
2fcd8982fc *: address comments. 2015-11-04 10:28:29 +08:00
6cdbf785c1 *: tiny refacotr tables.UpdateRecord. 2015-11-03 18:01:45 +08:00
7b7f69eedf *: tiny refactor tables.AddRecord. 2015-11-03 17:06:56 +08:00
5b7d18d541 *: Unify behavior of both local store and HBase
Please enter the commit message for your changes. Lines starting

Conflicts:
	kv/index_iter.go
2015-11-03 15:44:35 +08:00
b7943fbcec Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into qiuyesuifeng/schema-change-add-column 2015-11-03 12:02:22 +08:00
a32acc9a44 *: Merge branch 'master' and fix conflict 2015-11-03 11:53:21 +08:00
d787071dbd *: adjust column offset. 2015-11-03 11:33:28 +08:00
653f71de84 *: update update stmt and tiny clean up. 2015-11-02 22:04:02 +08:00
5b4ad54525 *: update insert and replace stmt. 2015-11-02 14:24:37 +08:00
3b55987799 Merge remote-tracking branch 'origin/master' into shenli/binder 2015-10-31 22:18:17 +08:00
dd2a84985c *: Merge branch 'master' into siddontang/dev-schema-change 2015-10-30 20:59:34 +08:00
b6ee1409fb *: Address comments 2015-10-30 19:07:44 +08:00
8f53419016 optimizer: fix bugs, pass tests. 2015-10-30 14:41:43 +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
f4e618f1c1 *: merge master and fix conflict. 2015-10-29 21:39:45 +08:00
59cd541484 *: Record selectList at the first time running SelectStmt.Plan.
Fix https://github.com/pingcap/tidb/issues/177
2015-10-29 19:05:43 +08:00
xia
da556cbaa4 *: unify expression.Assignment in parser 2015-10-29 14:24:37 +08:00
c8e855a29f *: merge master and fix conflict. 2015-10-28 15:34:15 +08:00
1b023694d5 stmts: Fix master
Add ctx to Compile in replace_test.go
2015-10-28 15:02:41 +08:00
628922ae35 Merge pull request #439 from pingcap/shenli/string-literal
Shenli/string literal
2015-10-28 14:54:51 +08:00
9d41ec5438 *: Merge branch 'master' into siddontang/dev-schema-change 2015-10-28 12:40:41 +08:00
09b66390cf *: Support show grants syntax and add ShowGrant interface to UserPrivileges 2015-10-27 22:01:07 +08:00
7d7d77f571 *: check database exists when create/drop table. 2015-10-27 20:11:09 +08:00
3ce3925e36 Merge pull request #448 from pingcap/zimuxia/replace
*: Add replace statement
2015-10-27 17:51:00 +08:00
fb3389094c *: fix drop table
fix https://github.com/pingcap/tidb/issues/457
2015-10-27 16:46:26 +08:00
xia
4f92173267 *: rename InsertRest to InsertValues and add TODOs 2015-10-27 13:21:35 +08:00
xia
376bdee59a stmt: update only modify columns. 2015-10-27 10:30:33 +08:00