com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/mysqli/te sts/mysqli_report.phpt ext/mysqli/tests/mysqli_report _wo_ps.phpt
ext/pdo_mysql/tests/pdo_mysql_stmt_ multiquery.phpt

Commit: f08a5bfadc360cb53574bdb2f4dc32ac30636133 Author: Dmitry Stogov <dmitry@zend.com> Fri, 20 Jun 2014 13:58:26 +0400 Parents: e9c9169e05e0f9753151c16e6a0806f9c5c614bb f0639611cf65a8a35119e65bad6f472346b14543 Branches: PHP-5.6 master phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f08a5bfadc360cb53574bdb2f4dc32ac30636133 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed MarinaDB support Changed paths: MM ext/mysqli/tests/mysqli_report.phpt MM ext/mysqli/tests/mysqli_report_wo_ps.phpt MM ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt Diff: diff --cc ext/mysqli/tests/mysqli_report.phpt index 4d2d355,6b132d2..3dcf498 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@@ -284,15 -287,17 +284,15 @@@ require_once('skipifconnectfailure.inc' require_once("clean_table.inc"); ?> --EXPECTF-- - Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d + Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d - Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FOO' at line 1 in %s on line %d + Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d -Warning: mysqli_change_user(): (%d/%d): Access denied for user '%s'@'%s' (using password: %s) in %s on line %d - Warning: mysqli_kill(): processid should have positive value in %s on line %d - Warning: mysqli_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FOO' at line 1 in %s on line %d + Warning: mysqli_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d - Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FOO' at line 1 in %s on line %d + Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d Warning: mysqli_kill(): processid should have positive value in %s on line %d diff --cc ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery..phpt index 56c37c5,b443579..52ecc91 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt @@@ -97,6 -97,6 +97,6 @@@ array(1) } Native Prepared Statements... - Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d + Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d -Fatal error: Call to a member function errorInfo() on a non-object in %s on line %d +Fatal error: Call to a member function errorInfo() on boolean in %s on line %d