Skip to content

Commit 5317ea6

Browse files
committed
Make mysqli_poll test more deterministic
Handle errors appearing in different order.
1 parent 73a0719 commit 5317ea6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ if (!$IS_MYSQLND)
106106
// either there is no result (no SELECT) or there is an error
107107
if (mysqli_errno($link) > 0) {
108108
$saved_errors[$thread_id] = mysqli_errno($link);
109-
printf("[003] '%s' caused %d\n", $links[$thread_id]['query'], mysqli_errno($link));
110109
}
111110
}
112111
}
@@ -115,10 +114,13 @@ if (!$IS_MYSQLND)
115114

116115
// Checking if all lines are still usable
117116
foreach ($links as $thread_id => $link) {
118-
if (isset($saved_errors[$thread_id]) &&
119-
$saved_errors[$thread_id] != mysqli_errno($link['link'])) {
120-
printf("[004] Error state not saved for query '%s', %d != %d\n", $link['query'],
121-
$saved_errors[$thread_id], mysqli_errno($link['link']));
117+
if (isset($saved_errors[$thread_id])) {
118+
printf("[003] '%s' caused %d\n",
119+
$links[$thread_id]['query'], $saved_errors[$thread_id]);
120+
if ($saved_errors[$thread_id] != mysqli_errno($link['link'])) {
121+
printf("[004] Error state not saved for query '%s', %d != %d\n", $link['query'],
122+
$saved_errors[$thread_id], mysqli_errno($link['link']));
123+
}
122124
}
123125

124126
if (!$res = mysqli_query($link['link'], 'SELECT * FROM test WHERE id = 100'))

0 commit comments

Comments
 (0)