Skip to content

Commit 65e0d0e

Browse files
midenokmidenok
committed
MDEV-25292 Removed thd argument in ddl_log functions
1 parent 595dad8 commit 65e0d0e

File tree

7 files changed

+54
-57
lines changed

7 files changed

+54
-57
lines changed

‎sql/ddl_log.cc‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3041,7 +3041,7 @@ static bool ddl_log_write(DDL_LOG_STATE *ddl_state,
30413041

30423042
mysql_mutex_lock(&LOCK_gdl);
30433043
error= ((ddl_log_write_entry(ddl_log_entry, &log_entry)) ||
3044-
ddl_log_write_execute_entry(log_entry->entry_pos,
3044+
ddl_log_write_execute_entry(log_entry->entry_pos, 0,
30453045
&ddl_state->execute_entry));
30463046
mysql_mutex_unlock(&LOCK_gdl);
30473047
if (error)
@@ -3060,7 +3060,7 @@ static bool ddl_log_write(DDL_LOG_STATE *ddl_state,
30603060
Logging of rename table
30613061
*/
30623062

3063-
bool ddl_log_rename_table(THD *thd, DDL_LOG_STATE *ddl_state,
3063+
bool ddl_log_rename_table(DDL_LOG_STATE *ddl_state,
30643064
handlerton *hton,
30653065
const LEX_CSTRING *org_db,
30663066
const LEX_CSTRING *org_alias,
@@ -3089,7 +3089,7 @@ bool ddl_log_rename_table(THD *thd, DDL_LOG_STATE *ddl_state,
30893089
Logging of rename view
30903090
*/
30913091

3092-
bool ddl_log_rename_view(THD *thd, DDL_LOG_STATE *ddl_state,
3092+
bool ddl_log_rename_view(DDL_LOG_STATE *ddl_state,
30933093
const LEX_CSTRING *org_db,
30943094
const LEX_CSTRING *org_alias,
30953095
const LEX_CSTRING *new_db,
@@ -3120,7 +3120,7 @@ bool ddl_log_rename_view(THD *thd, DDL_LOG_STATE *ddl_state,
31203120
is in original delete order.
31213121
*/
31223122

3123-
static bool ddl_log_drop_init(THD *thd, DDL_LOG_STATE *ddl_state,
3123+
static bool ddl_log_drop_init(DDL_LOG_STATE *ddl_state,
31243124
ddl_log_action_code action_code,
31253125
const LEX_CSTRING *db,
31263126
const LEX_CSTRING *comment)
@@ -3138,18 +3138,18 @@ static bool ddl_log_drop_init(THD *thd, DDL_LOG_STATE *ddl_state,
31383138
}
31393139

31403140

3141-
bool ddl_log_drop_table_init(THD *thd, DDL_LOG_STATE *ddl_state,
3141+
bool ddl_log_drop_table_init(DDL_LOG_STATE *ddl_state,
31423142
const LEX_CSTRING *db,
31433143
const LEX_CSTRING *comment)
31443144
{
3145-
return ddl_log_drop_init(thd, ddl_state, DDL_LOG_DROP_INIT_ACTION,
3145+
return ddl_log_drop_init(ddl_state, DDL_LOG_DROP_INIT_ACTION,
31463146
db, comment);
31473147
}
31483148

3149-
bool ddl_log_drop_view_init(THD *thd, DDL_LOG_STATE *ddl_state,
3149+
bool ddl_log_drop_view_init(DDL_LOG_STATE *ddl_state,
31503150
const LEX_CSTRING *db)
31513151
{
3152-
return ddl_log_drop_init(thd, ddl_state, DDL_LOG_DROP_INIT_ACTION,
3152+
return ddl_log_drop_init(ddl_state, DDL_LOG_DROP_INIT_ACTION,
31533153
db, &empty_clex_str);
31543154
}
31553155

@@ -3163,7 +3163,7 @@ bool ddl_log_drop_view_init(THD *thd, DDL_LOG_STATE *ddl_state,
31633163
See also comment before ddl_log_drop_init().
31643164
*/
31653165

3166-
static bool ddl_log_drop(THD *thd, DDL_LOG_STATE *ddl_state,
3166+
static bool ddl_log_drop(DDL_LOG_STATE *ddl_state,
31673167
ddl_log_action_code action_code,
31683168
uint phase,
31693169
handlerton *hton,
@@ -3209,32 +3209,32 @@ static bool ddl_log_drop(THD *thd, DDL_LOG_STATE *ddl_state,
32093209
}
32103210

32113211

3212-
bool ddl_log_drop_table(THD *thd, DDL_LOG_STATE *ddl_state,
3212+
bool ddl_log_drop_table(DDL_LOG_STATE *ddl_state,
32133213
handlerton *hton,
32143214
const LEX_CSTRING *path,
32153215
const LEX_CSTRING *db,
32163216
const LEX_CSTRING *table)
32173217
{
32183218
DBUG_ENTER("ddl_log_drop_table");
3219-
DBUG_RETURN(ddl_log_drop(thd, ddl_state,
3219+
DBUG_RETURN(ddl_log_drop(ddl_state,
32203220
DDL_LOG_DROP_TABLE_ACTION, DDL_DROP_PHASE_TABLE,
32213221
hton, path, db, table));
32223222
}
32233223

32243224

3225-
bool ddl_log_drop_view(THD *thd, DDL_LOG_STATE *ddl_state,
3225+
bool ddl_log_drop_view(DDL_LOG_STATE *ddl_state,
32263226
const LEX_CSTRING *path,
32273227
const LEX_CSTRING *db,
32283228
const LEX_CSTRING *table)
32293229
{
32303230
DBUG_ENTER("ddl_log_drop_view");
3231-
DBUG_RETURN(ddl_log_drop(thd, ddl_state,
3231+
DBUG_RETURN(ddl_log_drop(ddl_state,
32323232
DDL_LOG_DROP_VIEW_ACTION, 0,
32333233
(handlerton*) 0, path, db, table));
32343234
}
32353235

32363236

3237-
bool ddl_log_drop_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
3237+
bool ddl_log_drop_trigger(DDL_LOG_STATE *ddl_state,
32383238
const LEX_CSTRING *db,
32393239
const LEX_CSTRING *table,
32403240
const LEX_CSTRING *trigger_name,
@@ -3284,7 +3284,7 @@ bool ddl_log_drop_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
32843284
link to the previous entries (not setting ddl_log_entry.next_entry)
32853285
*/
32863286

3287-
bool ddl_log_drop_db(THD *thd, DDL_LOG_STATE *ddl_state,
3287+
bool ddl_log_drop_db(DDL_LOG_STATE *ddl_state,
32883288
const LEX_CSTRING *db, const LEX_CSTRING *path)
32893289
{
32903290
DDL_LOG_ENTRY ddl_log_entry;
@@ -3305,7 +3305,7 @@ bool ddl_log_drop_db(THD *thd, DDL_LOG_STATE *ddl_state,
33053305
example when deleting a table that was discovered.
33063306
*/
33073307

3308-
bool ddl_log_create_table(THD *thd, DDL_LOG_STATE *ddl_state,
3308+
bool ddl_log_create_table(DDL_LOG_STATE *ddl_state,
33093309
handlerton *hton,
33103310
const LEX_CSTRING *path,
33113311
const LEX_CSTRING *db,
@@ -3333,7 +3333,7 @@ bool ddl_log_create_table(THD *thd, DDL_LOG_STATE *ddl_state,
33333333
Log CREATE VIEW
33343334
*/
33353335

3336-
bool ddl_log_create_view(THD *thd, DDL_LOG_STATE *ddl_state,
3336+
bool ddl_log_create_view(DDL_LOG_STATE *ddl_state,
33373337
const LEX_CSTRING *path,
33383338
enum_ddl_log_create_view_phase phase)
33393339
{
@@ -3351,14 +3351,13 @@ bool ddl_log_create_view(THD *thd, DDL_LOG_STATE *ddl_state,
33513351
/**
33523352
Log creation of temporary file that should be deleted during recovery
33533353
3354-
@param thd Thread handler
33553354
@param ddl_log_state ddl_state
33563355
@param path Path to file to be deleted
33573356
@param depending_state If not NULL, then do not delete the temp file if this
33583357
entry exists and is active.
33593358
*/
33603359

3361-
bool ddl_log_delete_tmp_file(THD *thd, DDL_LOG_STATE *ddl_state,
3360+
bool ddl_log_delete_tmp_file(DDL_LOG_STATE *ddl_state,
33623361
const LEX_CSTRING *path,
33633362
DDL_LOG_STATE *depending_state)
33643363
{
@@ -3379,7 +3378,7 @@ bool ddl_log_delete_tmp_file(THD *thd, DDL_LOG_STATE *ddl_state,
33793378
Log CREATE TRIGGER
33803379
*/
33813380

3382-
bool ddl_log_create_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
3381+
bool ddl_log_create_trigger(DDL_LOG_STATE *ddl_state,
33833382
const LEX_CSTRING *db, const LEX_CSTRING *table,
33843383
const LEX_CSTRING *trigger_name,
33853384
enum_ddl_log_create_trigger_phase phase)
@@ -3404,7 +3403,7 @@ bool ddl_log_create_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
34043403
this is the final table name
34053404
*/
34063405

3407-
bool ddl_log_alter_table(THD *thd, DDL_LOG_STATE *ddl_state,
3406+
bool ddl_log_alter_table(DDL_LOG_STATE *ddl_state,
34083407
handlerton *org_hton,
34093408
const LEX_CSTRING *db, const LEX_CSTRING *table,
34103409
handlerton *new_hton,

‎sql/ddl_log.h‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -281,61 +281,59 @@ bool ddl_log_execute_entry(THD *thd, uint first_entry);
281281

282282
void ddl_log_add_entry(DDL_LOG_STATE *state, DDL_LOG_MEMORY_ENTRY *log_entry);
283283
void ddl_log_release_entries(DDL_LOG_STATE *ddl_log_state);
284-
bool ddl_log_rename_table(THD *thd, DDL_LOG_STATE *ddl_state,
284+
bool ddl_log_rename_table(DDL_LOG_STATE *ddl_state,
285285
handlerton *hton,
286286
const LEX_CSTRING *org_db,
287287
const LEX_CSTRING *org_alias,
288288
const LEX_CSTRING *new_db,
289289
const LEX_CSTRING *new_alias);
290-
bool ddl_log_rename_view(THD *thd, DDL_LOG_STATE *ddl_state,
290+
bool ddl_log_rename_view(DDL_LOG_STATE *ddl_state,
291291
const LEX_CSTRING *org_db,
292292
const LEX_CSTRING *org_alias,
293293
const LEX_CSTRING *new_db,
294294
const LEX_CSTRING *new_alias);
295-
bool ddl_log_drop_table_init(THD *thd, DDL_LOG_STATE *ddl_state,
295+
bool ddl_log_drop_table_init(DDL_LOG_STATE *ddl_state,
296296
const LEX_CSTRING *db,
297297
const LEX_CSTRING *comment);
298-
bool ddl_log_drop_view_init(THD *thd, DDL_LOG_STATE *ddl_state,
298+
bool ddl_log_drop_view_init(DDL_LOG_STATE *ddl_state,
299299
const LEX_CSTRING *db);
300-
bool ddl_log_drop_table(THD *thd, DDL_LOG_STATE *ddl_state,
300+
bool ddl_log_drop_table(DDL_LOG_STATE *ddl_state,
301301
handlerton *hton,
302302
const LEX_CSTRING *path,
303303
const LEX_CSTRING *db,
304304
const LEX_CSTRING *table);
305-
bool ddl_log_drop_view(THD *thd, DDL_LOG_STATE *ddl_state,
305+
bool ddl_log_drop_view(DDL_LOG_STATE *ddl_state,
306306
const LEX_CSTRING *path,
307307
const LEX_CSTRING *db,
308308
const LEX_CSTRING *table);
309-
bool ddl_log_drop_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
309+
bool ddl_log_drop_trigger(DDL_LOG_STATE *ddl_state,
310310
const LEX_CSTRING *db,
311311
const LEX_CSTRING *table,
312312
const LEX_CSTRING *trigger_name,
313313
const LEX_CSTRING *query);
314-
bool ddl_log_drop_view(THD *thd, DDL_LOG_STATE *ddl_state,
314+
bool ddl_log_drop_view(DDL_LOG_STATE *ddl_state,
315315
const LEX_CSTRING *path,
316316
const LEX_CSTRING *db,
317317
const LEX_CSTRING *table);
318-
bool ddl_log_drop_view(THD *thd, DDL_LOG_STATE *ddl_state,
319-
const LEX_CSTRING *db);
320-
bool ddl_log_drop_db(THD *thd, DDL_LOG_STATE *ddl_state,
318+
bool ddl_log_drop_db(DDL_LOG_STATE *ddl_state,
321319
const LEX_CSTRING *db, const LEX_CSTRING *path);
322-
bool ddl_log_create_table(THD *thd, DDL_LOG_STATE *ddl_state,
320+
bool ddl_log_create_table(DDL_LOG_STATE *ddl_state,
323321
handlerton *hton,
324322
const LEX_CSTRING *path,
325323
const LEX_CSTRING *db,
326324
const LEX_CSTRING *table,
327325
bool only_frm);
328-
bool ddl_log_create_view(THD *thd, DDL_LOG_STATE *ddl_state,
326+
bool ddl_log_create_view(DDL_LOG_STATE *ddl_state,
329327
const LEX_CSTRING *path,
330328
enum_ddl_log_create_view_phase phase);
331-
bool ddl_log_delete_tmp_file(THD *thd, DDL_LOG_STATE *ddl_state,
329+
bool ddl_log_delete_tmp_file(DDL_LOG_STATE *ddl_state,
332330
const LEX_CSTRING *path,
333331
DDL_LOG_STATE *depending_state);
334-
bool ddl_log_create_trigger(THD *thd, DDL_LOG_STATE *ddl_state,
332+
bool ddl_log_create_trigger(DDL_LOG_STATE *ddl_state,
335333
const LEX_CSTRING *db, const LEX_CSTRING *table,
336334
const LEX_CSTRING *trigger_name,
337335
enum_ddl_log_create_trigger_phase phase);
338-
bool ddl_log_alter_table(THD *thd, DDL_LOG_STATE *ddl_state,
336+
bool ddl_log_alter_table(DDL_LOG_STATE *ddl_state,
339337
handlerton *org_hton,
340338
const LEX_CSTRING *db, const LEX_CSTRING *table,
341339
handlerton *new_hton,

‎sql/sql_db.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ mysql_rm_db_internal(THD *thd, const LEX_CSTRING *db, bool if_exists,
11291129
debug_crash_here("ddl_log_drop_after_drop_tables");
11301130

11311131
LEX_CSTRING cpath{ path, path_length};
1132-
ddl_log_drop_db(thd, &ddl_log_state, &rm_db, &cpath);
1132+
ddl_log_drop_db(&ddl_log_state, &rm_db, &cpath);
11331133

11341134
drop_database_objects(thd, &cpath, &rm_db, rm_mysql_schema);
11351135

‎sql/sql_rename.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ rename_table_and_triggers(THD *thd, rename_param *param,
373373

374374
thd->replication_flags= 0;
375375

376-
if (ddl_log_rename_table(thd, ddl_log_state, hton,
376+
if (ddl_log_rename_table(ddl_log_state, hton,
377377
&ren_table->db, old_alias, new_db, new_alias))
378378
DBUG_RETURN(1);
379379

@@ -437,7 +437,7 @@ rename_table_and_triggers(THD *thd, rename_param *param,
437437
DBUG_RETURN(1);
438438
}
439439

440-
ddl_log_rename_view(thd, ddl_log_state, &ren_table->db,
440+
ddl_log_rename_view(ddl_log_state, &ren_table->db,
441441
&ren_table->table_name, new_db, new_alias);
442442
debug_crash_here("ddl_log_rename_before_rename_view");
443443
rc= mysql_rename_view(thd, new_db, new_alias, &ren_table->db,

‎sql/sql_table.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
819819
create_info->db_type= work_part_info->default_engine_type;
820820
/* NOTE: partitioned temporary tables are not supported. */
821821
DBUG_ASSERT(!create_info->tmp_table());
822-
if (ddl_log_create_table(thd, part_info, create_info->db_type, &new_path,
822+
if (ddl_log_create_table(part_info, create_info->db_type, &new_path,
823823
&alter_ctx->new_db, &alter_ctx->new_name, true) ||
824824
ERROR_INJECT("create_before_create_frm"))
825825
DBUG_RETURN(TRUE);
@@ -1536,7 +1536,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
15361536
if (!table_count++)
15371537
{
15381538
LEX_CSTRING comment= {comment_start, (size_t) comment_len};
1539-
if (ddl_log_drop_table_init(thd, ddl_log_state, current_db, &comment))
1539+
if (ddl_log_drop_table_init(ddl_log_state, current_db, &comment))
15401540
{
15411541
error= 1;
15421542
goto err;
@@ -1594,10 +1594,10 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
15941594
bool enoent_warning= !dont_log_query && !(hton && hton->discover_table);
15951595

15961596
if (was_view)
1597-
res= ddl_log_drop_view(thd, ddl_log_state, &cpath, &db,
1597+
res= ddl_log_drop_view(ddl_log_state, &cpath, &db,
15981598
&table_name);
15991599
else
1600-
res= ddl_log_drop_table(thd, ddl_log_state, hton, &cpath, &db,
1600+
res= ddl_log_drop_table(ddl_log_state, hton, &cpath, &db,
16011601
&table_name);
16021602
if (res)
16031603
{
@@ -1675,7 +1675,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
16751675
int ferror= 0;
16761676
DBUG_ASSERT(!was_view);
16771677

1678-
if (ddl_log_drop_table(thd, ddl_log_state, 0, &cpath, &db,
1678+
if (ddl_log_drop_table(ddl_log_state, 0, &cpath, &db,
16791679
&table_name))
16801680
{
16811681
error= -1;
@@ -4539,7 +4539,7 @@ int create_table_impl(THD *thd,
45394539
.frm files are deleted
45404540
*/
45414541
if (ddl_log_state_create)
4542-
ddl_log_create_table(thd, ddl_log_state_create, (handlerton*) 0, &path,
4542+
ddl_log_create_table(ddl_log_state_create, (handlerton*) 0, &path,
45434543
&db, &table_name, 1);
45444544

45454545
ha_err= hton->discover_table_structure(hton, thd, &share, create_info);
@@ -4564,7 +4564,7 @@ int create_table_impl(THD *thd,
45644564
else
45654565
{
45664566
if (ddl_log_state_create)
4567-
ddl_log_create_table(thd, ddl_log_state_create, create_info->db_type,
4567+
ddl_log_create_table(ddl_log_state_create, create_info->db_type,
45684568
&path, &db, &table_name, frm_only);
45694569
debug_crash_here("ddl_log_create_before_create_frm");
45704570

@@ -9446,7 +9446,7 @@ simple_rename_or_index_change(THD *thd, TABLE_LIST *table_list,
94469446
close_all_tables_for_name(thd, table->s, HA_EXTRA_PREPARE_FOR_RENAME,
94479447
NULL);
94489448

9449-
(void) ddl_log_rename_table(thd, &ddl_log_state, old_db_type,
9449+
(void) ddl_log_rename_table(&ddl_log_state, old_db_type,
94509450
&alter_ctx->db, &alter_ctx->table_name,
94519451
&alter_ctx->new_db, &alter_ctx->new_alias);
94529452
if (mysql_rename_table(old_db_type, &alter_ctx->db, &alter_ctx->table_name,
@@ -10508,7 +10508,7 @@ do_continue:;
1050810508
if (alter_ctx.is_table_renamed())
1050910509
tmp_table= alter_ctx.new_alias;
1051010510

10511-
if (ddl_log_alter_table(thd, &ddl_log_state,
10511+
if (ddl_log_alter_table(&ddl_log_state,
1051210512
old_db_type,
1051310513
&alter_ctx.db, &alter_ctx.table_name,
1051410514
new_db_type,

‎sql/sql_trigger.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
980980
/* Use the filesystem to enforce trigger namespace constraints. */
981981
trigger_exists= !access(trigname_file.str, F_OK);
982982

983-
ddl_log_create_trigger(thd, ddl_log_state, &tables->db, &tables->table_name,
983+
ddl_log_create_trigger(ddl_log_state, &tables->db, &tables->table_name,
984984
&lex->spname->m_name,
985985
trigger_exists || table->triggers->count ?
986986
DDL_CREATE_TRIGGER_PHASE_DELETE_COPY :
@@ -989,7 +989,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
989989
/* Make a backup of the .TRG file that we can restore in case of crash */
990990
if (table->triggers->count &&
991991
(sql_backup_definition_file(&file, &backup_name) ||
992-
ddl_log_delete_tmp_file(thd, ddl_log_state_tmp_file, &backup_name,
992+
ddl_log_delete_tmp_file(ddl_log_state_tmp_file, &backup_name,
993993
ddl_log_state)))
994994
DBUG_RETURN(true);
995995

@@ -1001,7 +1001,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
10011001

10021002
/* Make a backup of the .TRN file that we can restore in case of crash */
10031003
if (sql_backup_definition_file(&trigname_file, &backup_name) ||
1004-
ddl_log_delete_tmp_file(thd, ddl_log_state_tmp_file, &backup_name,
1004+
ddl_log_delete_tmp_file(ddl_log_state_tmp_file, &backup_name,
10051005
ddl_log_state))
10061006
DBUG_RETURN(true);
10071007
ddl_log_update_phase(ddl_log_state, DDL_CREATE_TRIGGER_PHASE_OLD_COPIED);
@@ -1345,7 +1345,7 @@ bool Table_triggers_list::drop_trigger(THD *thd, TABLE_LIST *tables,
13451345
/* This code is executed in case of DROP TRIGGER */
13461346
lex_string_set3(&query, thd->query(), thd->query_length());
13471347
}
1348-
if (ddl_log_drop_trigger(thd, ddl_log_state,
1348+
if (ddl_log_drop_trigger(ddl_log_state,
13491349
&tables->db, &tables->table_name,
13501350
sp_name, &query))
13511351
goto err;

0 commit comments

Comments
 (0)