1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use all arguments for ddl_log_write_execute_entry()

Browse Source 
Remove not anymore used
bool ddl_log_write_execute_entry(uint first_entry,
                                 DDL_LOG_MEMORY_ENTRY **active_entry)

Simple transformations, no logic changes.
This commit is contained in:
Monty 2025-01-05 17:32:39 +02:00
parent c234a312d7
commit 4992aaf9a2
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ddl_log.cc
View File

@ -3576,7 +3576,7 @@ bool ddl_log_store_query(THD *thd, DDL_LOG_STATE *ddl_state,
ddl_log_entry.extra_name.length= 0;
max_query_length= ddl_log_free_space_in_entry(&ddl_log_entry);
}
if (ddl_log_write_execute_entry(first_entry->entry_pos,
if (ddl_log_write_execute_entry(first_entry->entry_pos, 0,
&ddl_state->execute_entry))
goto err;

6
sql/ddl_log.h
View File

@ -264,12 +264,6 @@ bool ddl_log_write_entry(DDL_LOG_ENTRY *ddl_log_entry,
bool ddl_log_write_execute_entry(uint first_entry, uint cond_entry,
DDL_LOG_MEMORY_ENTRY** active_entry);
inline
bool ddl_log_write_execute_entry(uint first_entry,
DDL_LOG_MEMORY_ENTRY **active_entry)
{
return ddl_log_write_execute_entry(first_entry, 0, active_entry);
}
bool ddl_log_disable_execute_entry(DDL_LOG_MEMORY_ENTRY **active_entry);
void ddl_log_complete(DDL_LOG_STATE *ddl_log_state);

10
sql/sql_partition.cc
View File

@ -6746,7 +6746,7 @@ static bool write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt)
goto error;
log_entry= part_info->list;
part_info->main_entry= log_entry;
if (ddl_log_write_execute_entry(log_entry->entry_pos,
if (ddl_log_write_execute_entry(log_entry->entry_pos, 0,
&exec_log_entry))
goto error;
release_part_info_log_entries(old_first_log_entry);
@ -6802,7 +6802,7 @@ static bool write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
goto error;
log_entry= part_info->list;
part_info->main_entry= log_entry;
if (ddl_log_write_execute_entry(log_entry->entry_pos,
if (ddl_log_write_execute_entry(log_entry->entry_pos, 0,
&exec_log_entry))
goto error;
release_part_info_log_entries(old_first_log_entry);
@ -6836,7 +6836,7 @@ static bool write_log_convert_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
if (write_log_convert_partition(lpt, &next_entry, (const char*)path))
goto error;
DBUG_ASSERT(next_entry == part_info->list->entry_pos);
if (ddl_log_write_execute_entry(part_info->list->entry_pos,
if (ddl_log_write_execute_entry(part_info->list->entry_pos, 0,
&part_info->execute_entry))
goto error;
mysql_mutex_unlock(&LOCK_gdl);
@ -6892,7 +6892,7 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
goto error;
log_entry= part_info->list;
if (ddl_log_write_execute_entry(log_entry->entry_pos,
if (ddl_log_write_execute_entry(log_entry->entry_pos, 0,
&part_info->execute_entry))
goto error;
mysql_mutex_unlock(&LOCK_gdl);
@ -6960,7 +6960,7 @@ static bool write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
log_entry= part_info->list;
part_info->main_entry= log_entry;
/* Overwrite the revert execute log entry with this retry execute entry */
if (ddl_log_write_execute_entry(log_entry->entry_pos,
if (ddl_log_write_execute_entry(log_entry->entry_pos, 0,
&exec_log_entry))
goto error;
release_part_info_log_entries(old_first_log_entry);

2
sql/sql_partition_admin.cc
View File

@ -385,7 +385,7 @@ static bool exchange_name_with_ddl_log(THD *thd,
DBUG_EXECUTE_IF("exchange_partition_fail_2", goto err_no_execute_written;);
DBUG_EXECUTE_IF("exchange_partition_abort_2", DBUG_SUICIDE(););
if (unlikely(ddl_log_write_execute_entry(log_entry->entry_pos,
if (unlikely(ddl_log_write_execute_entry(log_entry->entry_pos, 0,
&exec_log_entry)))
goto err_no_execute_written;
/* ddl_log is written and synced */

2
sql/sql_table.cc
View File

@ -911,7 +911,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
if (write_log_replace_frm(lpt, part_info->list->entry_pos,
(const char*) bak_path,
(const char*) path) ||
ddl_log_write_execute_entry(part_info->list->entry_pos,
ddl_log_write_execute_entry(part_info->list->entry_pos, 0,
&part_info->execute_entry))
{
mysql_mutex_unlock(&LOCK_gdl);