Commit Graph

1576 Commits

Author SHA1 Message Date
31d0dbd222 tidb: Check reduce/reduce conflicts in Makefile 2015-11-15 17:36:22 +08:00
9620eb0d53 Merge pull request #589 from pingcap/shenli/parser-conflict
parser: Fix reduce/reduce conflicts
2015-11-14 23:04:39 +08:00
176dfee876 parser: Fix reduce/reduce conflicts
There are more than one "STATUS" in UnReservedKeyword rule
2015-11-14 22:15:54 +08:00
551527db9a Merge pull request #582 from pingcap/zimuxia/store-status
*: store global status variables to the db
2015-11-13 19:48:30 +08:00
xia
1ad237a952 Merge branch 'master' into zimuxia/store-status
Conflicts:
	plan/plans/info.go
2015-11-12 20:48:37 +08:00
xia
2b7064c567 *: store status variables to the db
and update info test
2015-11-12 20:36:29 +08:00
xia
6cf2c6f3b0 plan: add init function 2015-11-12 20:34:43 +08:00
xia
915ce84474 ddl: update log 2015-11-12 20:33:56 +08:00
6d229525ac Merge pull request #576 from pingcap/coocood/index-point-lookup
plan: fix index point lookup.
2015-11-12 19:14:19 +08:00
c1b4921f6a Merge pull request #568 from pingcap/shenli/mysqldump
Add support for mysqldump
2015-11-12 16:03:25 +08:00
b41d64c334 Merge branch 'master' into coocood/index-point-lookup
Conflicts:
	tidb_test.go
2015-11-12 15:33:47 +08:00
f49d073b70 Merge pull request #577 from pingcap/shenli/issue-571
fix issue 571
2015-11-12 15:24:56 +08:00
18ce6b604c *: Fix bug in session.Retry()
Miss commit after retry
2015-11-12 15:00:24 +08:00
e88ba4c060 Merge pull request #579 from pingcap/coocood/extract-quickstart
docs: extract quick start section to its own file.
2015-11-12 13:03:45 +08:00
c8ea3068a8 plan: address comment. 2015-11-12 12:28:44 +08:00
b00955f4e4 tidb: Fix bug for stmt retry and add unit test case 2015-11-12 12:26:19 +08:00
7bd318c835 plan: fix index point lookup.
The type converted seek value should be used to as the index key.
2015-11-12 11:53:22 +08:00
e228879484 docs: fix link 2015-11-12 10:31:59 +08:00
973320bc61 docs: extract quick start section to its own file.
The README.md file is too long.
2015-11-12 10:29:38 +08:00
4a6348cce7 Merge pull request #566 from netroby/pr/add-introduce-docker
Document add: how to using docker with tidb
2015-11-12 10:08:20 +08:00
3b59e0c404 Merge pull request #550 from pingcap/qiuyesuifeng/issue-279
Fix #279
2015-11-12 09:36:22 +08:00
50cec9436e Remove one line doc about replace config
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-11-12 08:05:13 +08:00
d05b2075b1 Merge branch 'master' into pr/add-introduce-docker 2015-11-11 20:05:55 +08:00
739d770542 Merge pull request #574 from pingcap/coocood/index-point-lookup
plan: call kv.Index Exists for point lookup.
2015-11-11 19:46:12 +08:00
59e1187f18 plan: address comment. 2015-11-11 18:33:43 +08:00
2d36bc727b plan: fix comment. 2015-11-11 18:13:55 +08:00
78f9001f93 plan: call kv.Index Exists for point lookup.
Optimisation for index point lookup.
2015-11-11 18:09:55 +08:00
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
xia
b672788e4c Merge branch 'master' into zimuxia/store-status 2015-11-11 16:50:36 +08:00
9c711296c1 Merge pull request #551 from pingcap/zimuxia/issue525
*: Support show status statement
2015-11-11 16:38:12 +08:00
d5cf283f91 *: Address comment 2015-11-11 15:09:26 +08:00
dff8503ca1 tidb: Retry for FinishTxn without rollback 2015-11-11 14:40:24 +08:00
c611523c4c Merge branch 'master' into pr/add-introduce-docker 2015-11-11 12:42:25 +08:00
xia
40f6d99748 *: store status variables to the db and add
the corresponding test
2015-11-11 12:32:40 +08:00
b3a137d8a8 *: Address comment 2015-11-11 12:26:44 +08:00
f09f61a79c *: Add some unit tests 2015-11-11 11:34:13 +08:00
1ae87e7d2f Merge pull request #565 from shuhuai007/master
add intellij items for gitignore config
2015-11-11 11:25:05 +08:00
e431344d54 Fix typo errors for docker doc sections
Thanks for @siddontang

Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-11-11 11:13:05 +08:00
410b9349fc Document add: how to using docker with tidb
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-11-11 09:19:16 +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
48f6bc4b0d *: add UnknownSystemVar 2015-11-10 21:31:40 +08:00
xia
ed741a3c98 util: update error 2015-11-10 20:59:57 +08:00
xia
301d96bdb1 sessionctx: remove ErrUnKownStatusVar 2015-11-10 20:22:50 +08:00
xia
3684664f5d *: use terror instead of error 2015-11-10 20:16:22 +08:00
2a63a0ec49 add intellij items for gitignore config 2015-11-10 20:12:15 +08:00
xia
809f5055b1 *: adjust the show status results and add test 2015-11-10 19:15:08 +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
421b958f41 localstore: Fix a bug in kv_test.go
Fix ci failure.
2015-11-10 17:38:50 +08:00