shenli 486089f450 Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2 ...

Conflicts:
	stmt/stmts/account_manage.go

2015-10-16 14:24:11 +08:00

..

col_def.go

*: Fix hibernate bug about col.Flen/Decimal

2015-10-13 18:11:11 +08:00

opt.go

Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2

2015-10-13 10:09:11 +08:00