Commit Graph

2537 Commits

Author SHA1 Message Date
3a63ddcb7e Merge pull request #824 from pingcap/coocood/fix-is-null-panic
plan/plans: fix is null panic.
2016-01-04 16:35:39 +08:00
50d858ff5c plan/plans: fix is null panic. 2016-01-04 16:02:05 +08:00
050bde6afc Merge pull request #812 from pingcap/coocood/pk-handle2
*: Unify PK and handle Phase2
2016-01-04 14:25:57 +08:00
67c30ac655 Merge branch 'master' into coocood/pk-handle2
Conflicts:
	optimizer/optimizer.go
	optimizer/plan/cost.go
2016-01-04 11:59:20 +08:00
10515c8d8f Merge pull request #821 from pingcap/qiuyesuifeng/optimizer-cleanup
Tiny clean up optimizer package.
2016-01-04 11:53:00 +08:00
0d3070a720 Merge branch 'master' into coocood/pk-handle2
Conflicts:
	executor/executor.go
2016-01-04 11:48:10 +08:00
a9f58a0be7 executor: address comment. 2016-01-04 11:33:23 +08:00
3a8701c1e7 optimizer: address comment. 2016-01-04 10:49:55 +08:00
fcbd15dae8 optimizer: address comment. 2016-01-04 10:34:41 +08:00
846af1710a Merge pull request #820 from pingcap/qiuyesuifeng/tiny-clean-up
executor: tiny clean up.
2016-01-04 10:28:02 +08:00
a8baf4fc02 optimizer: clean up again. 2016-01-03 12:40:23 +08:00
d1f0c76952 optimizer: tiny clean up. 2016-01-03 12:36:18 +08:00
9b17f3f319 executor: clean up. 2016-01-02 10:44:13 +08:00
44fa34e4a6 executor: tiny clean up. 2016-01-02 09:09:48 +08:00
81bf7f94a8 Merge pull request #819 from pingcap/qiuyesuifeng/tiny-clean-up
ast: tiny clean up.
2016-01-01 13:09:53 +08:00
805a745873 ast: tiny clean up. 2016-01-01 10:04:13 +08:00
788b3de76c plan/plans: address comment. 2015-12-31 21:01:50 +08:00
832ca7e6e0 Merge pull request #818 from pingcap/qiuyesuifeng/tiny-clean-up
Tiny clean up ast package.
2015-12-31 20:33:27 +08:00
6ba33a012e ast: clean up expr/func/misc. 2015-12-31 20:24:15 +08:00
f19a5f44d6 ast: tiny clean up ddl and dml. 2015-12-31 20:07:19 +08:00
c064caf50f Merge pull request #817 from pingcap/qiuyesuifeng/tiny-clean-up
ast: rename newNod to newNode.
2015-12-31 18:33:12 +08:00
41209693d2 ast: rename newNod to newNode. 2015-12-31 18:22:03 +08:00
d64166c65b Merge pull request #814 from c-wind/master
add txn.Rollback on txn error
2015-12-31 12:39:24 +08:00
cc0d4d8b8b Merge branch 'master' into master 2015-12-31 12:35:35 +08:00
10339a8270 Merge branch 'master' into coocood/pk-handle2 2015-12-31 12:31:30 +08:00
1faad8a14e Merge pull request #813 from pingcap/disksing/new-tso
hbase: update for new tso
2015-12-31 12:29:33 +08:00
c0e86a5150 add txn.Rollback on txn error 2015-12-31 12:23:09 +08:00
926fbab7c9 *: address comment, add more tests. 2015-12-31 12:01:06 +08:00
1f0ddbfa22 Merge branch 'master' into disksing/new-tso 2015-12-31 10:21:09 +08:00
10c8f3a4c7 executor: refine table scan executor. 2015-12-30 15:52:35 +08:00
e882caf8ff *: Unify PK and handle Phase2
Support table range scan.
Avoid creating PK handle index.
2015-12-29 22:40:10 +08:00
e45c31b89d Merge pull request #754 from hhkbp2/complete-adddate,subdate-functions
add ast evaluation for date arith
2015-12-29 14:35:00 +08:00
405e6c57d4 add ast evaluation for date arith 2015-12-29 11:42:02 +08:00
0376f4ae5c Merge pull request #808 from pingcap/ngaut/reduce-allocation
util: Reduce allocation.
2015-12-29 11:04:38 +08:00
202f56b4b8 Address comments 2015-12-29 10:51:46 +08:00
2cc2024562 Merge pull request #807 from pingcap/coocood/pk-handle
*:Unify integer PK and handle phase1
2015-12-29 10:33:37 +08:00
d47e773bad util/types: remove optimisation not related to this PR. 2015-12-29 10:23:54 +08:00
fca76e816c *: address comment. 2015-12-29 10:17:43 +08:00
c4e18bb422 Merge branch 'master' into coocood/pk-handle
Conflicts:
	plan/plans/index_test.go
2015-12-29 09:59:54 +08:00
3b56db1566 Merge pull request #806 from pingcap/disksing/reduce-string-bytes-convert
*: reduce string bytes convert
2015-12-28 20:09:57 +08:00
1664303233 Merge pull request #796 from pingcap/shenli/variable-error
*: Move variable errors to sessionctx/variable
2015-12-28 19:16:58 +08:00
58ffe22390 hbase: update for new tso 2015-12-28 17:06:51 +08:00
085200467b *: fix CI check 2015-12-28 13:23:09 +08:00
5382590706 ddl, stmt/stmts: address comment. 2015-12-28 12:52:48 +08:00
bd3681ec0e *: minor changes 2015-12-28 12:49:26 +08:00
bd3db841fa util: Reduce allocation. 2015-12-28 12:30:56 +08:00
39624b3949 *: address comment 2015-12-28 11:07:07 +08:00
2bb206fbc9 table/tables: use types.ToInt64 2015-12-26 22:03:32 +08:00
e5eef7b2fd Merge remote-tracking branch 'origin/master' into shenli/variable-error 2015-12-26 21:55:20 +08:00
c3bdfb1fed stmt/stmts: insert use primary key value as record ID 2015-12-25 21:02:52 +08:00