From: Nikita Popov Date: Wed, 28 Oct 2020 10:35:38 +0000 (+0100) Subject: Merge branch 'PHP-7.4' into PHP-8.0 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d928c5828186a31c76b1553da2d07800d6761072;p=php Merge branch 'PHP-7.4' into PHP-8.0 * PHP-7.4: Handle mysqli errors in more cases Sync test with master --- d928c5828186a31c76b1553da2d07800d6761072 diff --cc ext/mysqli/tests/mysqli_report.phpt index dda3c3ec73,3373097697..1dbf1e4dc1 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@@ -292,7 -322,20 +321,19 @@@ mysqli_kill(): Argument #2 ($process_id 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 %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d + + Warning: mysqli_autocommit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + + Warning: mysqli_commit(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + + Warning: mysqli_rollback(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + + Warning: mysqli_stmt_prepare(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + + Warning: mysqli_store_result(): (%s/%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_stmt_attr_set(): (%s/%d): Not implemented in %s on line %d - -Warning: mysqli_kill(): processid should have positive value in %s on line %d +mysqli_kill(): Argument #2 ($process_id) must be greater than 0 Warning: mysqli_stmt_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 [013] Access denied for user '%s'@'%s' (using password: YES)