Commit Graph

252 Commits

Author SHA1 Message Date
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
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
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
42390a18ff ddl: drop index once to reduce conflict retry. 2015-11-23 16:48:11 +08:00
e4b8a64df4 ddl: delete should skip ErrNotExist error. 2015-11-23 16:47:22 +08:00
e1d30ae367 table: remove dependency on 'LastInsertID' 2015-11-23 13:32:34 +08:00
01a7171220 *: Make go vet --shadow happy 2015-11-23 13:02:56 +08:00
xia
fd7eeded6c Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into zimuxia/show_status 2015-11-20 13:05:49 +08:00
c959346213 ddl: cleanup and notify job done after transaction. 2015-11-20 09:36:42 +08:00
b443304d67 ddl: Address comment. 2015-11-18 21:56:50 +08:00
xia
200686bd57 *: rename mockStatist to mockStatistics, and
do tiny clean
2015-11-18 13:33:38 +08:00
4a73a35f78 ddl: update reorg snapshot version and then run it next time.
If we run reorganization immediately, the snapshot version is not
updated in meta, so if at this time, server crashes, the snapshot
version is lost but we may have backfilled some wrong data.
So we must update the snapshot version firstly, and then run
reorganization work.
2015-11-18 12:57:58 +08:00
xia
a7531125e8 Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into zimuxia/show_status
Conflicts:
	ddl/stat.go
2015-11-18 10:50:19 +08:00
9c6b27877d *: must wait 2 * lease schema lease time when running job. 2015-11-18 09:53:14 +08:00
xia
f4ca52ea36 Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into zimuxia/show_status
Conflicts:
	ddl/ddl.go
	domain/domain.go
2015-11-17 15:56:52 +08:00
xia
7b41184fe6 *: rename statist to statistics 2015-11-17 15:12:53 +08:00