Merging fix from mysql-5.5 and extra change in mysql-5.6

The no_free_space warning message requires string type
for third argument in this version and not integer type.