mysql在win8.1+vs2013下编译通过
Merge branch 'master' of https://github.com/cloutn/chill

Conflicts:
	free/mysql/include/config-win.h
	free/mysql/include/m_string.h