Merge remote-tracking branch 'mysql2cn/master'
Merge remote-tracking branch 'mysql2cn/master'
Merge remote-tracking branch 'mysql2cn/master'
0826
Revert "0826"

This reverts commit f38b17f5e942983ad1e0e734f9a045902e606505.
0826
Merge pull request #16 from lieyia/master

Commit 0826