Integrate changes on MySQL version