Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd.c
add test
merge fix
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Merge branch 'master' of git.php.net:php-src