Fix another problem with MySQL 5.7
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src