From abe06a47a8b3760d983fd659073d558f3035e50d Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sat, 18 Jan 2025 18:15:15 +0000 Subject: [PATCH] Improve mysqli_thread_id test --- ext/mysqli/tests/mysqli_stmt_get_result.phpt | 4 ++-- ext/mysqli/tests/mysqli_thread_id.phpt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index e043f198bd378..06f18aaa47180 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -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))) diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index b3465d9b3cec9..be88bf6bb9d21 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -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 {