diff options
author | Aleksey Midenkov <midenok@gmail.com> | 2021-09-09 11:58:45 +0300 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-10-26 17:07:46 +0200 |
commit | d324c03d0c6395629213af98eaf5fc859d8eea12 (patch) | |
tree | ac84c7d04b0ce8c33aceb3a65ad96b49daa234fb /mysys/my_malloc.c | |
parent | 2dc3c3207056edbbaa37e4342c5d98c79a0132a0 (diff) | |
download | mariadb-git-d324c03d0c6395629213af98eaf5fc859d8eea12.tar.gz |
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.
Diffstat (limited to 'mysys/my_malloc.c')
-rw-r--r-- | mysys/my_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index befdcb0e5c3..b2cbb84984d 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -84,7 +84,7 @@ void *my_malloc(PSI_memory_key key, size_t size, myf my_flags) /* We have to align size as we store MY_THREAD_SPECIFIC flag in the LSB */ size= ALIGN_SIZE(size); - if (DBUG_EVALUATE_IF("simulate_out_of_memory", 1, 0)) + if (DBUG_IF("simulate_out_of_memory")) mh= NULL; else mh= (my_memory_header*) sf_malloc(size + HEADER_SIZE, my_flags); |