From: Nikita Popov Date: Wed, 11 Nov 2020 15:03:10 +0000 (+0100) Subject: Merge branch 'PHP-7.4' into PHP-8.0 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d776c31a3404ade29dacd3487b99adefdcec09a2;p=php Merge branch 'PHP-7.4' into PHP-8.0 * PHP-7.4: Handle errors during next_result() --- d776c31a3404ade29dacd3487b99adefdcec09a2 diff --cc ext/mysqli/tests/mysqli_report.phpt index 1dbf1e4dc1,7a343bdef8..840c2c017a --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@@ -330,10 -331,17 +330,16 @@@ Warning: mysqli_rollback(): (%s/%d): Co Warning: mysqli_stmt_prepare(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + Warning: mysqli_next_result(): (%s/%d): Commands out of sync; you can't run this command now in %s on line %d + + Warning: mysqli_next_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_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_next_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)