database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Errors from failed drop tables where ignored by atomic ddl.

Browse Source
This commit is contained in:
Monty
2021-09-03 13:54:00 +03:00
parent 40ae9c5d10
commit 7e31cfda64
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ddl_log.cc
View File

@@ -910,9 +910,10 @@ public:
int handled_errors; int handled_errors;
int unhandled_errors; int unhandled_errors;
int first_error; int first_error;
bool only_ignore_non_existing_errors;
ddl_log_error_handler() : handled_errors(0), unhandled_errors(0), ddl_log_error_handler() : handled_errors(0), unhandled_errors(0),
first_error(0) first_error(0), only_ignore_non_existing_errors(0)
{} {}
bool handle_condition(THD *thd, bool handle_condition(THD *thd,
@@ -923,8 +924,10 @@ public:
Sql_condition ** cond_hdl) Sql_condition ** cond_hdl)
{ {
*cond_hdl= NULL; *cond_hdl= NULL;
if (non_existing_table_error(sql_errno) || sql_errno == EE_LINK || if (non_existing_table_error(sql_errno) ||
sql_errno == EE_DELETE || sql_errno == ER_TRG_NO_DEFINER) (!only_ignore_non_existing_errors &&
(sql_errno == EE_LINK ||
sql_errno == EE_DELETE || sql_errno == ER_TRG_NO_DEFINER)))
{ {
handled_errors++; handled_errors++;
return TRUE; return TRUE;
@@ -936,7 +939,6 @@ public:
unhandled_errors++; unhandled_errors++;
return FALSE; return FALSE;
} }
bool safely_trapped_errors() bool safely_trapped_errors()
{ {
return (handled_errors > 0 && unhandled_errors == 0); return (handled_errors > 0 && unhandled_errors == 0);
@@ -1537,7 +1539,10 @@ static int ddl_log_execute_action(THD *thd, MEM_ROOT *mem_root,
case DDL_DROP_PHASE_TABLE: case DDL_DROP_PHASE_TABLE:
if (hton) if (hton)
{ {
if ((error= hton->drop_table(hton, path.str))) no_such_table_handler.only_ignore_non_existing_errors= 1;
error= hton->drop_table(hton, path.str);
no_such_table_handler.only_ignore_non_existing_errors= 0;
if (error)
{ {
if (!non_existing_table_error(error)) if (!non_existing_table_error(error))
break; break;
@@ -2285,6 +2290,7 @@ static int ddl_log_execute_action(THD *thd, MEM_ROOT *mem_root,
end: end:
delete file; delete file;
/* We are only interested in errors that where not ignored */
if ((error= (no_such_table_handler.unhandled_errors > 0))) if ((error= (no_such_table_handler.unhandled_errors > 0)))
my_errno= no_such_table_handler.first_error; my_errno= no_such_table_handler.first_error;
thd->pop_internal_handler(); thd->pop_internal_handler();