1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-23542 Server crashes in thd_clear_errors()

Browse Source 
1) Checked presence of mysys_var.
2) Removed unneeded thd_clear_errors,
  its content added to THD::change_user.
This commit is contained in:
Oleksandr Byelkin 2021-05-05 19:27:29 +02:00 committed by Nikita Malyavin
parent da63eb16c9
commit 0775ca315e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_class.cc
View File

@ -299,17 +299,6 @@ THD *thd_get_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
@ -1422,7 +1411,10 @@ void THD::change_user(void)
cleanup();
cleanup_done= 0;
reset_killed();
thd_clear_errors(this);
/* Clear errors from the previous THD */
my_errno= 0;
if (mysys_var)
mysys_var->abort= 0;
/* Clear warnings. */
if (!get_stmt_da()->is_warning_info_empty())