Commit Graph

267 Commits

Author SHA1 Message Date
c4e18bb422 Merge branch 'master' into coocood/pk-handle
Conflicts:
	plan/plans/index_test.go
2015-12-29 09:59:54 +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
39624b3949 *: address comment 2015-12-28 11:07:07 +08:00
c3bdfb1fed stmt/stmts: insert use primary key value as record ID 2015-12-25 21:02:52 +08:00
48c8b75edb *: reduce string bytes convert 2015-12-25 20:52:36 +08:00
56ff3d3000 model, ddl: add PKIsHandle field in TableInfo. 2015-12-25 20:29:21 +08:00
3b410a00ff Merge pull request #744 from pingcap/zimuxia/update-inspectkv
*:  Support compare records
2015-12-24 17:40:06 +08:00
852ad1dc0f Merge pull request #789 from pingcap/coocood/parser-parse
parser: remove YYParse function, use Parse and ParseOneStmt instead.
2015-12-24 11:51:55 +08:00
631045ce5f parser: address comment. 2015-12-24 10:47:37 +08:00
bfd188d844 parser: remove YYParse function, use Parse and ParseOne instead. 2015-12-23 18:25:28 +08:00
fbe684270b *: Use schema errors in ddl 2015-12-23 16:10:15 +08:00
ec5ce966c9 *: schema errors
1. Move schema errors from terror to infoschema.
2. Convert those errors to mysql error.
2015-12-23 13:07:02 +08:00
xia
c5ba66c4cf Merge branch 'master' into zimuxia/update-inspectkv 2015-12-22 10:11:35 +08:00
322476ca68 *: add tag to log message to make it easy to be filtered out. 2015-12-17 20:04:20 +08:00
eba26bd705 Merge pull request #731 from pingcap/zimuxia/tiny-cleanup
*: Tiny clean up
2015-12-17 13:21:41 +08:00
xia
b12a61698c ddl: update test 2015-12-17 13:12:38 +08:00
xia
e3dcbfcbc0 ddl: remove getColumn 2015-12-15 21:25:31 +08:00
42d2694f37 Merge pull request #717 from pingcap/disksing/update-codec
update codec
2015-12-15 10:07:32 +08:00
043f536c32 Merge pull request #692 from pingcap/zimuxia/inspect-kv
*: Support inspect kv
2015-12-14 14:29:35 +08:00
c8d7ed1357 Merge branch 'master' into disksing/update-codec 2015-12-14 14:10:10 +08:00
56fff40d62 *: Address comment 2015-12-13 22:49:40 +08:00
f9305e38c8 *: Address comment 2015-12-11 23:17:11 +08:00
5e52c60240 *: Fix bug for select @@character_set_database
1. Add charset info when create schema
2. Set charset variable when run use statement
Fix: https://github.com/pingcap/tidb/issues/706
2015-12-11 14:29:32 +08:00
a66bc590bc util/codec: remove stringFlag 2015-12-11 12:47:20 +08:00
xia
a78548e8d0 Merge branch 'master' into zimuxia/inspect-kv
Conflicts:
	table/tables/tables.go
2015-12-10 16:55:30 +08:00
af6635b079 *: address comments. 2015-12-09 19:08:37 +08:00
2d5d930ee2 Merge branch 'master' into qiuyesuifeng/refector-codec 2015-12-09 18:17:06 +08:00
d44db8b272 Merge pull request #651 from pingcap/coocood/new-plan
optimizer, executor: Use new plan for simple select statement.
2015-12-09 17:37:26 +08:00
facce7468a *: simplify record/index key codec. 2015-12-09 16:26:24 +08:00
xia
c120ba8dab *: address comments 2015-12-09 14:51:04 +08:00
7336360a59 *: return error instead of log.Fatal for TableFromMeta 2015-12-09 14:30:38 +08:00
xia
9aca8dc288 *: update IterRecords and RowWithCols 2015-12-09 13:21:25 +08:00
xia
200b35b061 Merge branch 'master' into zimuxia/inspect-kv
Conflicts:
	kv/kv.go
2015-12-09 12:27:01 +08:00
xia
9a348f0a14 inspectkv: support inspect kv 2015-12-09 12:11:24 +08:00
50f9e43e8b *: tiny clean up. 2015-12-08 16:39:25 +08:00
958ce2284f *: tiny refactor table record/index key codec. 2015-12-08 15:35:14 +08:00
307993205b kv, store: remove MvccSnapshot 2015-12-07 10:40:19 +08:00
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
cc1af7573b ddl: creating database/table uses public state directly. 2015-11-30 12:40:58 +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
b66afe8443 *: cleanup prefix 'z' 2015-11-27 20:03:54 +08:00
5eaee7300f ddl: resolve conflict. 2015-11-27 19:58:12 +08:00
0de45f2866 Merge branch 'master' into disksing/refactor-lasetinsertid 2015-11-27 19:09:33 +08:00
8c0a4d50ae *: add test flag to skip long time DDL test. 2015-11-27 16:20:18 +08:00
9426554819 *: Address comment 2015-11-27 15:57:32 +08:00
f024f02dbd *: Make go vet --shadow happy
Also do some clean up.
2015-11-27 15:47:05 +08:00
bb5d702d57 *: Address comment 2015-11-27 15:35:19 +08:00
83a73341ce ddl: Add index id when adding index with ddl 2015-11-27 15:20:16 +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