Commit 0775ca31 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin Committed by Nikita Malyavin

MDEV-23542 Server crashes in thd_clear_errors()

1) Checked presence of mysys_var.
2) Removed unneeded thd_clear_errors,
  its content added to THD::change_user.
parent da63eb16
...@@ -299,17 +299,6 @@ THD *thd_get_current_thd() ...@@ -299,17 +299,6 @@ THD *thd_get_current_thd()
return current_thd; return current_thd;
} }
/**
Clear errors from the previous THD
@param thd THD object
*/
void thd_clear_errors(THD *thd)
{
my_errno= 0;
thd->mysys_var->abort= 0;
}
/** /**
Get thread attributes for connection threads Get thread attributes for connection threads
...@@ -1422,7 +1411,10 @@ void THD::change_user(void) ...@@ -1422,7 +1411,10 @@ void THD::change_user(void)
cleanup(); cleanup();
cleanup_done= 0; cleanup_done= 0;
reset_killed(); reset_killed();
thd_clear_errors(this); /* Clear errors from the previous THD */
my_errno= 0;
if (mysys_var)
mysys_var->abort= 0;
/* Clear warnings. */ /* Clear warnings. */
if (!get_stmt_da()->is_warning_info_empty()) if (!get_stmt_da()->is_warning_info_empty())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment