Commit Graph

1970 Commits

Author SHA1 Message Date
cf798eae9f Merge pull request #648 from pingcap/siddontang/ddl-test-flag
add test flag to skip long time DDL test.
2015-11-27 19:08:35 +08:00
f241e4f8cb Merge pull request #649 from pingcap/siddontang/update-server-lease
tidb_server: some tests should use 0 for fast DDL.
2015-11-27 19:04:32 +08:00
137ee79f49 tidb_server: some tests should use 0 for fast DDL. 2015-11-27 16:38:51 +08:00
8c0a4d50ae *: add test flag to skip long time DDL test. 2015-11-27 16:20:18 +08:00
58b04969f2 Merge pull request #581 from pingcap/siddontang/dev-schema-change
support async online DDL change
2015-11-27 11:56:08 +08:00
624dd90f24 structure: pre-alloc encoded key size. 2015-11-27 10:45:57 +08:00
f1b47be52f Merge pull request #644 from pingcap/shenli/fix-retry
Shenli/fix retry
2015-11-26 18:51:30 +08:00
8b75da26a9 *: Add test case for retry prepared statement 2015-11-26 15:54:30 +08:00
a825f10e5e tidb: Fix bug for add prepared stmt into history 2015-11-26 15:10:32 +08:00
a54d3ebe62 Merge pull request #642 from pingcap/siddontang/auto-rollback
tidb: err should rollback in auto commit or DDL.
2015-11-26 14:59:21 +08:00
76b6c8ca61 Merge pull request #643 from pingcap/shenli/refactor-gettxn
tidb: Refactor GetTxn
2015-11-26 14:09:36 +08:00
ebe1ff97fa tidb: Refactor GetTxn 2015-11-26 13:58:29 +08:00
d97a175513 tidb: err should rollback in auto commit or DDL. 2015-11-26 12:59:21 +08:00
e94bf0f184 Merge pull request #641 from pingcap/zimuxia/tiny-clean-status
*: Tiny clean up status variables
2015-11-26 12:07:08 +08:00
xia
2a9993eb4a sessionctx: tiny clean 2015-11-26 11:57:34 +08:00
xia
b97612130a *: tiny clean 2015-11-26 11:36:57 +08:00
ce9f08d1ab Merge pull request #640 from pingcap/shenli/fix-retry
*: Fix retry bug
2015-11-26 09:24:57 +08:00
7124752e68 tidb: remove useless code 2015-11-25 23:50:12 +08:00
f492dd665a *: Fix retry bug 2015-11-25 23:47:37 +08:00
1dc9ba2e4f *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-25 21:06:27 +08:00
f34301739b Merge pull request #638 from pingcap/shenli/retry
*: reset query history when GetTxn
2015-11-25 20:16:09 +08:00
fd54ebb191 *: reset query history when GetTxn 2015-11-25 20:13:58 +08:00
d47572968e Merge pull request #632 from pingcap/shenli/fix-issue571-test
tidb: Make sure TestIssue571 pass
2015-11-25 19:53:49 +08:00
c487a31402 *: merge master and fix conflict. 2015-11-25 19:53:29 +08:00
2c5359e284 Merge pull request #637 from pingcap/ngaut/govet-happy
*: Pass go vet shadow check
2015-11-25 17:19:42 +08:00
4b784a00ef Merge pull request #625 from pingcap/ngaut/turning
performance turning
2015-11-25 17:17:29 +08:00
32c3e031d5 Address comments 2015-11-25 14:46:48 +08:00
6001658292 *: Pass go vet shadow check 2015-11-25 13:01:28 +08:00
1e3345d0d3 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-24 19:46:52 +08:00
28d49bdb69 Merge pull request #635 from pingcap/c4pt0r/retryable-error
kv: add retryable err
2015-11-24 19:24:03 +08:00
cd3d3cd6ae kv: address comments 2015-11-24 19:18:53 +08:00
36f100ece4 *: address review comments 2015-11-24 19:14:08 +08:00
c408e81e71 kv: add retryable err
kv store returns ErrRetryable to tell SQL layer it's safe to retry
2015-11-24 19:12:40 +08:00
aa92d10bc6 tidb: Make sure TestIssue571 pass
Set session maxRetryCnt to unlimited times.
2015-11-24 16:21:41 +08:00
8c199f81f3 Fix data race 2015-11-24 15:59:11 +08:00
7d9d802af7 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-24 15:32:10 +08:00
0b4d849cbf Merge remote-tracking branch 'origin/master' into perf-turning 2015-11-24 13:53:03 +08:00
3df86c58ea Merge remote-tracking branch 'origin/ngaut/turning' into perf-turning 2015-11-24 13:49:14 +08:00
1d9169c651 Merge pull request #629 from pingcap/disksing/update-themis
hbase: minor changes for go-themis updates.
2015-11-24 13:48:03 +08:00
63b6650e7f Clean up 2015-11-24 13:43:44 +08:00
cd311fb947 *: add comment. 2015-11-24 13:22:51 +08:00
dcad5d5228 Merge pull request #627 from pingcap/siddontang/update-codec-alloc
update bytes alloc.
2015-11-24 12:05:27 +08:00
8ba428e2fe codec: fix typo 2015-11-24 12:01:12 +08:00
e8c8b1fdcb codec: update bytes alloc. 2015-11-24 11:58:40 +08:00
3287656e3c hbase: minor changes for go-themis updates. 2015-11-24 11:00:18 +08:00
8aca043d43 Rename lw to lmb 2015-11-24 10:56:01 +08:00
f650c0fd0d Merge pull request #624 from pingcap/zimuxia/autocommit
*: Fix  autocommit
2015-11-24 10:50:35 +08:00
xia
bad75a1693 *: update comments 2015-11-24 10:37:42 +08:00
68b6ef9a86 store: Less allocation 2015-11-23 21:06:54 +08:00
xia
cf5833e6a3 *: add test 2015-11-23 20:54:56 +08:00