Commit Graph

211 Commits

Author SHA1 Message Date
281216bfcf *: Support user with anyhost(%) 2015-12-01 11:54:03 +08:00
106b221834 *: fix gofmt 2015-11-27 13:53:26 +08:00
75352d81a4 Merge branch 'master' into disksing/refactor-lasetinsertid
Conflicts:
	ddl/ddl_test.go
	plan/plans/from_test.go
	session_test.go
	stmt/stmts/insert.go
	stmt/stmts/replace.go
2015-11-27 13:29:51 +08:00
c487a31402 *: merge master and fix conflict. 2015-11-25 19:53:29 +08:00
0abfff4664 *: address comments 2015-11-24 10:14:15 +08:00
5cde0bb219 stmt: refactor getRow() 2015-11-23 17:36:39 +08:00
868d6afd90 stmt: refactor insert 2015-11-23 16:41:17 +08:00
38336cd64a *: refactor, return recordID directly instead of using the 'LastInsertID' session var 2015-11-23 13:32:34 +08:00
090131288a *: add test case, fix #620 2015-11-23 13:32:34 +08:00
e1d30ae367 table: remove dependency on 'LastInsertID' 2015-11-23 13:32:34 +08:00
5f3f6b1d97 *: merge master and fix conflict. 2015-11-23 10:44:59 +08:00
842931a56c *: merge master and fix conflict. 2015-11-19 16:08:50 +08:00
9759dc8549 stmt: optimize batch insert 2015-11-17 16:32:44 +08:00
b5540a3447 kv: support delayed check, optimize batch insert 2015-11-16 18:16:16 +08:00
42cea84752 *: merge master and fix conflict. 2015-11-16 10:30:15 +08:00
9d4230f84f Merge pull request #498 from pingcap/disksing/hbase-store
store: add HBase support
2015-11-16 10:19:48 +08:00
4b6672bd0a hbase-store: address comments 2015-11-13 18:53:48 +08:00
301ea1c93a *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-13 09:41:12 +08:00
9c0d8eaa01 stmt: fix insert list issue 2015-11-12 14:40: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
eac072d5e6 Merge branch 'master' into disksing/hbase-store 2015-11-11 17:09:39 +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
c26bf83711 stmt, kv: prefetch indices for select statement 2015-11-10 16:17:49 +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