com php-src: Merge branch 'PHP-7.4' into PHP-8.0: ext/mysqli/my sqli_api.c ext/mysqli/tests/mysqli_report.phpt ext/ mysqlnd/mysqlnd_ps.c

Commit: d928c5828186a31c76b1553da2d07800d6761072 Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 28 Oct 2020 11:35:38 +0100 Parents: 793bf12f8c322438ffaec1882cce7eaed5233d4f 990bb34891c83d12c5129fd781893704f948f2f4 Branches: PHP-8.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d928c5828186a31c76b1553da2d07800d6761072 Log: Merge branch 'PHP-7.4' into PHP-8.0 * PHP-7.4: Handle mysqli errors in more cases Sync test with master Changed paths: MM ext/mysqli/mysqli_api.c MM ext/mysqli/tests/mysqli_report.phpt MM ext/mysqlnd/mysqlnd_ps.c Diff: diff --cc ext/mysqli/tests/mysqli_report.phpt index dda3c3ec734,33730976976..1dbf1e4dc19 --- 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)