shenli 6a364d4f03 Merge remote-tracking branch 'origin/master' into shenli/optimizer-error ...

Conflicts:
	tidb-server/server/server_test.go

2015-12-24 11:18:41 +08:00

..

server

Merge remote-tracking branch 'origin/master' into shenli/optimizer-error

2015-12-24 11:18:41 +08:00

main.go

tidb: minor typo corrections

2015-12-14 16:29:15 +08:00