Commit Graph

225 Commits

Author SHA1 Message Date
2fe9938ca0 *: Support show procedure status syntax 2015-12-21 12:15:56 +08:00
67ad875a29 *: Convert ErrKeyExists to MySQL error 2015-12-17 23:56:16 +08:00
a90413a656 kv, table: use minimal kv interfaces 2015-12-16 17:22:25 +08:00
a0105fec82 *: Address comment 2015-12-11 23:20:32 +08:00
5e52c60240 *: Fix bug for select @@character_set_database
1. Add charset info when create schema
2. Set charset variable when run use statement
Fix: https://github.com/pingcap/tidb/issues/706
2015-12-11 14:29:32 +08:00
2d5d930ee2 Merge branch 'master' into qiuyesuifeng/refector-codec 2015-12-09 18:17:06 +08:00
d44db8b272 Merge pull request #651 from pingcap/coocood/new-plan
optimizer, executor: Use new plan for simple select statement.
2015-12-09 17:37:26 +08:00
50f9e43e8b *: tiny clean up. 2015-12-08 16:39:25 +08:00
281216bfcf *: Support user with anyhost(%) 2015-12-01 11:54:03 +08:00
546d9a8ef8 Merge branch 'master' into coocood/new-plan
Conflicts:
	ddl/ddl_test.go
2015-11-27 19:51:11 +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
575ca779c3 Merge branch 'master' into coocood/new-plan 2015-11-26 20:08:12 +08:00
c487a31402 *: merge master and fix conflict. 2015-11-25 19:53:29 +08:00
6001658292 *: Pass go vet shadow check 2015-11-25 13:01:28 +08:00
242444b182 Merge branch 'master' into coocood/new-plan 2015-11-24 14:17:27 +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
9af46bbdb6 Merge branch 'master' into coocood/new-plan 2015-11-18 10:06:35 +08:00
c6888526ec executor: pass more tests. 2015-11-17 21:50:00 +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