mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Vanilla cleanups and refactorings
Dead code cleanup: part_info->num_parts usage was wrong and working incorrectly in mysql_drop_partitions() because num_parts is already updated in prep_alter_part_table(). We don't have to update part_info->partitions because part_info is destroyed at alter_partition_lock_handling(). Cleanups: - DBUG_EVALUATE_IF() macro replaced by shorter form DBUG_IF(); - Typo in ER_KEY_COLUMN_DOES_NOT_EXITS. Refactorings: - Splitted write_log_replace_delete_frm() into write_log_delete_frm() and write_log_replace_frm(); - partition_info via DDL_LOG_STATE; - set_part_info_exec_log_entry() removed. DBUG_EVALUATE removed DBUG_EVALUTATE was only added for consistency together with DBUG_EVALUATE_IF. It is not used anywhere in the code. DBUG_SUICIDE() fix on release build On release DBUG_SUICIDE() was statement. It was wrong as DBUG_SUICIDE() is used in expression context.
This commit is contained in:
committed by
Sergei Golubchik
parent
2dc3c32070
commit
d324c03d0c
@ -807,9 +807,7 @@ do_retry:
|
||||
{
|
||||
mysql_mutex_lock(&entry->LOCK_parallel_entry);
|
||||
if (entry->stop_on_error_sub_id == (uint64) ULONGLONG_MAX ||
|
||||
#ifndef DBUG_OFF
|
||||
(DBUG_EVALUATE_IF("simulate_mdev_12746", 1, 0)) ||
|
||||
#endif
|
||||
DBUG_IF("simulate_mdev_12746") ||
|
||||
rgi->gtid_sub_id < entry->stop_on_error_sub_id)
|
||||
{
|
||||
register_wait_for_prior_event_group_commit(rgi, entry);
|
||||
|
Reference in New Issue
Block a user