xia a78548e8d0 Merge branch 'master' into zimuxia/inspect-kv ...

Conflicts:
	table/tables/tables.go

2015-12-10 16:55:30 +08:00

..

col_def.go

parse: update comments

2015-12-09 12:11:36 +08:00

opt.go

*: Parse delay_key_write option but ignore it

2015-12-09 16:18:39 +08:00