database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-05-07 15:00:27 +03:00
parent a04202673f 35977e81f9
commit 916b237b3f
110 changed files with 1776 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_class.cc
View File

@ -335,17 +335,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;
}
extern "C" unsigned long long thd_query_id(const MYSQL_THD thd)
{
@ -1440,7 +1429,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())