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

MDEV-20494 Fix wrongly ignored error status

Browse Source
This commit is contained in:
Aleksey Midenkov
2020-04-03 23:55:48 +03:00
parent 76063c2a13
commit 198af54bb9
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/sql_partition.cc
View File

@ -6848,9 +6848,9 @@ static void release_log_entries(partition_info *part_info)
alter_partition_lock_handling() alter_partition_lock_handling()
lpt Struct carrying parameters lpt Struct carrying parameters
RETURN VALUES RETURN VALUES
NONE true on error
*/ */
static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt) static bool alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt)
{ {
THD *thd= lpt->thd; THD *thd= lpt->thd;
@ -6864,24 +6864,9 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt)
lpt->table= 0; lpt->table= 0;
lpt->table_list->table= 0; lpt->table_list->table= 0;
if (thd->locked_tables_mode) if (thd->locked_tables_mode)
{ return thd->locked_tables_list.reopen_tables(thd, false);
Diagnostics_area *stmt_da= NULL;
Diagnostics_area tmp_stmt_da(true);
if (unlikely(thd->is_error())) return false;
{
/* reopen might fail if we have a previous error, use a temporary da. */
stmt_da= thd->get_stmt_da();
thd->set_stmt_da(&tmp_stmt_da);
}
// TODO: why error status of reopen_tables() is ignored?
if (unlikely(thd->locked_tables_list.reopen_tables(thd, false)))
sql_print_warning("We failed to reacquire LOCKs in ALTER TABLE");
if (stmt_da)
thd->set_stmt_da(stmt_da);
}
} }
@ -7082,6 +7067,8 @@ err_exclusive_lock:
thd->set_stmt_da(&tmp_stmt_da); thd->set_stmt_da(&tmp_stmt_da);
} }
/* NB: error status is not needed here, the statement fails with
the original error. */
if (unlikely(thd->locked_tables_list.reopen_tables(thd, false))) if (unlikely(thd->locked_tables_list.reopen_tables(thd, false)))
sql_print_warning("We failed to reacquire LOCKs in ALTER TABLE"); sql_print_warning("We failed to reacquire LOCKs in ALTER TABLE");
@ -7305,13 +7292,14 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
ERROR_INJECT_ERROR("fail_drop_partition_8") || ERROR_INJECT_ERROR("fail_drop_partition_8") ||
(write_log_completed(lpt, FALSE), FALSE) || (write_log_completed(lpt, FALSE), FALSE) ||
ERROR_INJECT_CRASH("crash_drop_partition_9") || ERROR_INJECT_CRASH("crash_drop_partition_9") ||
ERROR_INJECT_ERROR("fail_drop_partition_9") || ERROR_INJECT_ERROR("fail_drop_partition_9"))
(alter_partition_lock_handling(lpt), FALSE))
{ {
handle_alter_part_error(lpt, action_completed, TRUE, frm_install, handle_alter_part_error(lpt, action_completed, TRUE, frm_install,
close_table_on_failure); close_table_on_failure);
goto err; goto err;
} }
if (alter_partition_lock_handling(lpt))
goto err;
} }
else if ((alter_info->partition_flags & ALTER_PARTITION_ADD) && else if ((alter_info->partition_flags & ALTER_PARTITION_ADD) &&
(part_info->part_type == RANGE_PARTITION || (part_info->part_type == RANGE_PARTITION ||
@ -7382,13 +7370,14 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
ERROR_INJECT_ERROR("fail_add_partition_9") || ERROR_INJECT_ERROR("fail_add_partition_9") ||
(write_log_completed(lpt, FALSE), FALSE) || (write_log_completed(lpt, FALSE), FALSE) ||
ERROR_INJECT_CRASH("crash_add_partition_10") || ERROR_INJECT_CRASH("crash_add_partition_10") ||
ERROR_INJECT_ERROR("fail_add_partition_10") || ERROR_INJECT_ERROR("fail_add_partition_10"))
(alter_partition_lock_handling(lpt), FALSE))
{ {
handle_alter_part_error(lpt, action_completed, FALSE, frm_install, handle_alter_part_error(lpt, action_completed, FALSE, frm_install,
close_table_on_failure); close_table_on_failure);
goto err; goto err;
} }
if (alter_partition_lock_handling(lpt))
goto err;
} }
else else
{ {
@ -7487,13 +7476,14 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
ERROR_INJECT_ERROR("fail_change_partition_11") || ERROR_INJECT_ERROR("fail_change_partition_11") ||
(write_log_completed(lpt, FALSE), FALSE) || (write_log_completed(lpt, FALSE), FALSE) ||
ERROR_INJECT_CRASH("crash_change_partition_12") || ERROR_INJECT_CRASH("crash_change_partition_12") ||
ERROR_INJECT_ERROR("fail_change_partition_12") || ERROR_INJECT_ERROR("fail_change_partition_12"))
(alter_partition_lock_handling(lpt), FALSE))
{ {
handle_alter_part_error(lpt, action_completed, FALSE, frm_install, handle_alter_part_error(lpt, action_completed, FALSE, frm_install,
close_table_on_failure); close_table_on_failure);
goto err; goto err;
} }
if (alter_partition_lock_handling(lpt))
goto err;
} }
downgrade_mdl_if_lock_tables_mode(thd, mdl_ticket, MDL_SHARED_NO_READ_WRITE); downgrade_mdl_if_lock_tables_mode(thd, mdl_ticket, MDL_SHARED_NO_READ_WRITE);
/* /*