Commit Graph

91 Commits

Author SHA1 Message Date
97e328bf44 Merge pull request #636 from pingcap/shenli/index-id
*: Add ID to IndexInfo and use IndexID in prefix instead of IndexName
2015-11-30 19:39:59 +08:00
173aad00bb Merge pull request #647 from pingcap/go-vet-happy
*: Make go vet --shadow happy
2015-11-28 17:55:23 +08:00
f6714853c7 tables: use 't' for table record and index prefix. 2015-11-27 20:30:29 +08:00
f024f02dbd *: Make go vet --shadow happy
Also do some clean up.
2015-11-27 15:47:05 +08:00
1a28ff83a0 Merge remote-tracking branch 'origin/master' into shenli/index-id
Conflicts:
	ddl/ddl.go
	kv/index_iter.go
2015-11-27 14:28:59 +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
b9135eadb4 *: Add ID to IndexInfo and use IndexID in prefix instead of IndexName 2015-11-24 21:58:26 +08:00
0abfff4664 *: address comments 2015-11-24 10:14:15 +08:00
6b5e22a93f *: merge master and fix conflict. 2015-11-23 13:34:48 +08:00
e1d30ae367 table: remove dependency on 'LastInsertID' 2015-11-23 13:32:34 +08:00
d8ae7c1e36 *: Make go vet happy 2015-11-23 13:19:12 +08:00
d698b5c8ef table: address comment. 2015-11-19 21:20:28 +08:00
56b42f3df5 table: fix table cols and writeable cols cache. 2015-11-19 21:04:20 +08:00
c358a966c8 tables: use Convert to add correct default value. 2015-11-18 17:32:13 +08:00
4230f79995 ddl: add reorg state schema change test and fix a drop index bug. 2015-11-11 17:09:42 +08:00
2815fb1fbb tables: Address comment. 2015-11-11 13:42:49 +08:00
4eb34f69ce *: distinguish write/delete reorganization state.
we must distinguish different reorganization state after write only/
delete only state.
2015-11-11 13:29:06 +08:00
930729a058 Merge branch 'master' into qiuyesuifeng/more-schema-test and fix
conflict.
2015-11-10 17:44:18 +08:00
99212f39fe *: tiny refactor remove record. 2015-11-10 17:16:29 +08:00
46cbfb10ea *: check state when creating table. 2015-11-09 10:11:46 +08:00
cda586fdd8 tables: add record must consider reorg state 2015-11-09 09:37:14 +08:00
a21673dff3 *: merge master and fix conflict. 2015-11-06 16:33:50 +08:00
229ae62876 *: merge master and fix conflict 2015-11-05 15:02:17 +08:00
0943aa598e terror: unify util/errors and util/errors2 in terror. 2015-11-05 12:05:16 +08:00
695dd29ab4 table: address comment. 2015-11-04 10:33:49 +08:00
184b9bc497 table: typo. 2015-11-04 10:31:13 +08:00
2fcd8982fc *: address comments. 2015-11-04 10:28:29 +08:00
ba04f4457f *: address comments. 2015-11-03 19:35:18 +08:00
6cdbf785c1 *: tiny refacotr tables.UpdateRecord. 2015-11-03 18:01:45 +08:00
7b7f69eedf *: tiny refactor tables.AddRecord. 2015-11-03 17:06:56 +08:00
5b7d18d541 *: Unify behavior of both local store and HBase
Please enter the commit message for your changes. Lines starting

Conflicts:
	kv/index_iter.go
2015-11-03 15:44:35 +08:00
3b12473d44 *: use offset arg instead of temp offset. 2015-11-03 14:34:02 +08:00
95ac33b9b5 *: address comment. 2015-11-03 13:13:00 +08:00
b7943fbcec Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into qiuyesuifeng/schema-change-add-column 2015-11-03 12:02:22 +08:00
a32acc9a44 *: Merge branch 'master' and fix conflict 2015-11-03 11:53:21 +08:00
795d6491b5 *: clean up iterator Next 2015-11-03 11:19:24 +08:00
653f71de84 *: update update stmt and tiny clean up. 2015-11-02 22:04:02 +08:00
5b4ad54525 *: update insert and replace stmt. 2015-11-02 14:24:37 +08:00
d36e07d092 *: use WriteableCols to tiny refactor and fix test. 2015-11-02 13:31:31 +08:00
6eb02834aa *: add column state check support. 2015-11-01 12:45:37 +08:00
8fc1747f35 Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into qiuyesuifeng/use-index-exist 2015-10-30 21:52:18 +08:00
9c932a9c6b ddl: using index exist for check. 2015-10-30 21:19:10 +08:00
e6514db97b *: tiny clean up. 2015-10-30 21:06:49 +08:00
dd2a84985c *: Merge branch 'master' into siddontang/dev-schema-change 2015-10-30 20:59:34 +08:00
3278e885d6 *: remove unnecessary db arg. 2015-10-30 15:07:54 +08:00
f4e618f1c1 *: merge master and fix conflict. 2015-10-29 21:39:45 +08:00
32fe0db38b *: add create/drop index 2015-10-28 22:00:30 +08:00
44e5ed7d77 table: clean up. 2015-10-28 20:52:36 +08:00
c8e855a29f *: merge master and fix conflict. 2015-10-28 15:34:15 +08:00
35d6cde648 Change error name style 2015-10-28 11:44:38 +08:00