mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Improve mysqli_thread_id test (#17515)
This commit is contained in:
@@ -152,8 +152,8 @@ require_once 'skipifconnectfailure.inc';
|
||||
mysqli_free_result($result);
|
||||
|
||||
$link->real_query('KILL '.mysqli_thread_id($link));
|
||||
// We kill our own connection so we should get "Query execution was interrupted"
|
||||
if ($link->errno !== 1317)
|
||||
// We kill our own connection so we should get "Query execution was interrupted" or "Connection was killed"
|
||||
if ($link->errno !== 1317 && $link->errno !== 1927)
|
||||
printf("[042] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
|
||||
|
||||
if (false !== ($tmp = mysqli_stmt_get_result($stmt)))
|
||||
|
||||
@@ -21,10 +21,10 @@ require_once 'skipifconnectfailure.inc';
|
||||
|
||||
// should work if the thread id is correct
|
||||
$link->real_query('KILL '.mysqli_thread_id($link));
|
||||
// We kill our own connection so we should get "Query execution was interrupted"
|
||||
if ($link->errno !== 1317)
|
||||
// We kill our own connection so we should get "Query execution was interrupted" or "Connection was killed"
|
||||
if ($link->errno !== 1317 && $link->errno !== 1927)
|
||||
printf("[042] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
|
||||
|
||||
|
||||
mysqli_close($link);
|
||||
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user