diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-08 16:38:18 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-08 16:38:18 +0200 |
| commit | 5293c6d6d4b3faa8eecf48429c1b8a351167fc94 (patch) | |
| tree | f317bc4cb367d6b88287388208a72ce4c777bd08 /ext/mysqli | |
| parent | 3ea94ed78e5dab77f2c21b678ad39befc0009f98 (diff) | |
| parent | 5317ea6d5753eb0d658fe81f815d17e304e9c804 (diff) | |
| download | php-git-5293c6d6d4b3faa8eecf48429c1b8a351167fc94.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Make mysqli_poll test more deterministic
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 13dcb12093..a52c2355d5 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -106,7 +106,6 @@ if (!$IS_MYSQLND) // either there is no result (no SELECT) or there is an error if (mysqli_errno($link) > 0) { $saved_errors[$thread_id] = mysqli_errno($link); - printf("[003] '%s' caused %d\n", $links[$thread_id]['query'], mysqli_errno($link)); } } } @@ -115,10 +114,13 @@ if (!$IS_MYSQLND) // Checking if all lines are still usable foreach ($links as $thread_id => $link) { - if (isset($saved_errors[$thread_id]) && - $saved_errors[$thread_id] != mysqli_errno($link['link'])) { - printf("[004] Error state not saved for query '%s', %d != %d\n", $link['query'], + if (isset($saved_errors[$thread_id])) { + printf("[003] '%s' caused %d\n", + $links[$thread_id]['query'], $saved_errors[$thread_id]); + if ($saved_errors[$thread_id] != mysqli_errno($link['link'])) { + printf("[004] Error state not saved for query '%s', %d != %d\n", $link['query'], $saved_errors[$thread_id], mysqli_errno($link['link'])); + } } if (!$res = mysqli_query($link['link'], 'SELECT * FROM test WHERE id = 100')) |