Support for mysql 5.6

Sorry, I did a mess with the previous commit. So I here it is a new pull request with some small fixes and the indentations fixed

Regards