Skip to content

Improve mysqli_thread_id test #17515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2025
Merged

Improve mysqli_thread_id test #17515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_stmt_get_result.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
6 changes: 3 additions & 3 deletions ext/mysqli/tests/mysqli_thread_id.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading