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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2016-12-27 07:07:36 +04:00
parent 99c2493cec 143d512a22
commit 4e23bfa11c
101 changed files with 1247 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_class.cc
View File

@ -650,6 +650,28 @@ bool Drop_table_error_handler::handle_condition(THD *thd,
}
/**
Handle an error from MDL_context::upgrade_lock() and mysql_lock_tables().
Ignore ER_LOCK_ABORTED and ER_LOCK_DEADLOCK errors.
*/
bool
MDL_deadlock_and_lock_abort_error_handler::
handle_condition(THD *thd,
uint sql_errno,
const char *sqlstate,
Sql_condition::enum_warning_level level,
const char* msg,
Sql_condition **cond_hdl)
{
*cond_hdl= NULL;
if (sql_errno == ER_LOCK_ABORTED || sql_errno == ER_LOCK_DEADLOCK)
m_need_reopen= true;
return m_need_reopen;
}
/**
Send timeout to thread.