Commit Graph

2578 Commits

Author SHA1 Message Date
129dcf892d Merge pull request #836 from pingcap/qiuyesuifeng/tiny-clean-up
Make better code review.
2016-01-11 22:27:39 +08:00
c0b22d334f ast: flag setter sort. 2016-01-11 21:46:16 +08:00
cab079d18d executor/converter: sort statements in Convert function. 2016-01-11 20:18:46 +08:00
c1f44b9881 Merge pull request #835 from pingcap/shenli/new-plan-reorg
*: Refactor new plan work flow
2016-01-11 18:31:43 +08:00
6de43ef9a7 Merge pull request #833 from pingcap/shenli/dev-agg-count
*: Support count aggregate function in new plan and add unit tests.
2016-01-11 18:10:40 +08:00
dd5e520157 *: Refactor new plan work flow 2016-01-11 17:22:51 +08:00
4f0e90a95f Merge remote-tracking branch 'origin/master' into shenli/dev-agg-count
Conflicts:
	executor/executor.go
2016-01-11 14:00:53 +08:00
5d676e0505 Merge pull request #811 from pingcap/zimuxia/inspectkv-sql
*: Support inspectkv
2016-01-11 12:11:44 +08:00
a437d44690 ast: Address comments 2016-01-11 11:52:38 +08:00
18ff43a511 *: Address comments 2016-01-11 11:25:16 +08:00
xia
42e6fe0077 Merge branch 'master' into zimuxia/inspectkv-sql
Conflicts:
	parser/parser.y
2016-01-11 11:18:42 +08:00
f71da4c73c Merge pull request #834 from AkihiroSuda/builtin-version-function
builtin: add version()
2016-01-11 10:53:57 +08:00
xia
807531c256 table: address comments 2016-01-11 09:55:38 +08:00
2c5bfaebb0 builtin: add version() 2016-01-10 14:46:47 +00:00
760eb79a1a ast: Address comments 2016-01-10 22:17:30 +08:00
f996a0ce9c *: Support count aggregate function in new plan and add unit tests. 2016-01-09 11:26:35 +08:00
xia
7066bb4ea4 executor: update log 2016-01-07 13:08:07 +08:00
59ecc2a58d Merge pull request #823 from pingcap/zimuxia/unify-del-idx
ddl: Unify drop table index and tiny clean up
2016-01-07 13:03:18 +08:00
xia
acd1ccfdac executor: address comments 2016-01-07 11:26:05 +08:00
xia
e39a0fd28a Merge branch 'master' into zimuxia/inspectkv-sql
Conflicts:
	parser/parser.y
2016-01-07 11:02:58 +08:00
xia
f6bb202aae parser: address comments 2016-01-07 10:54:20 +08:00
d86639cd1b Merge pull request #830 from hhkbp2/add-time-function-dayname
builtin: add time function dayname()
2016-01-07 09:54:15 +08:00
b607c8504b builtin: add time function dayname()
add builtin time function dayname()
2016-01-06 20:11:31 +08:00
xia
d7fecbdbea *: address comments 2016-01-06 17:34:08 +08:00
xia
f4dece1cab table: update RowWithCols and add test 2016-01-06 15:09:45 +08:00
xia
6e895bc997 executor: add test 2016-01-06 15:09:14 +08:00
xia
aba44d445c Merge branch 'master' into zimuxia/inspectkv-sql 2016-01-06 12:46:32 +08:00
xia
896ee778a2 *: address comments 2016-01-06 12:40:10 +08:00
81359df491 Merge pull request #828 from pingcap/shenli/issue-822
*: Show key content in DuplicateEntry error message
2016-01-05 21:44:46 +08:00
d8a6a9385c tables: Address comment and refactor AddRecord methord 2016-01-05 18:03:01 +08:00
a0f1c4b824 kv: Address comments 2016-01-05 17:15:54 +08:00
aca48efaf5 *: Show key content in DuplicateEntry error message
Fix: https://github.com/pingcap/tidb/issues/822
2016-01-05 13:54:26 +08:00
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
xia
534e8f434d ddl: address comments 2016-01-04 16:13:49 +08:00
50d858ff5c plan/plans: fix is null panic. 2016-01-04 16:02:05 +08:00
xia
28f7fade49 ddl: unify drop table index and tiny clean up 2016-01-04 15:57:32 +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