Skip to content

Commit a883082

Browse files
Improve mysqli_thread_id test (#17515)
1 parent d6d23fe commit a883082

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/mysqli/tests/mysqli_stmt_get_result.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ require_once 'skipifconnectfailure.inc';
152152
mysqli_free_result($result);
153153

154154
$link->real_query('KILL '.mysqli_thread_id($link));
155-
// We kill our own connection so we should get "Query execution was interrupted"
156-
if ($link->errno !== 1317)
155+
// We kill our own connection so we should get "Query execution was interrupted" or "Connection was killed"
156+
if ($link->errno !== 1317 && $link->errno !== 1927)
157157
printf("[042] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
158158

159159
if (false !== ($tmp = mysqli_stmt_get_result($stmt)))

ext/mysqli/tests/mysqli_thread_id.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ require_once 'skipifconnectfailure.inc';
2121

2222
// should work if the thread id is correct
2323
$link->real_query('KILL '.mysqli_thread_id($link));
24-
// We kill our own connection so we should get "Query execution was interrupted"
25-
if ($link->errno !== 1317)
24+
// We kill our own connection so we should get "Query execution was interrupted" or "Connection was killed"
25+
if ($link->errno !== 1317 && $link->errno !== 1927)
2626
printf("[042] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
27-
27+
2828
mysqli_close($link);
2929

3030
try {

0 commit comments

Comments
 (0)