Skip to content

Commit fa8ce92

Browse files
MDEV-34682 Return the return value of ddl recovery done in ha_initialize_handlerton
Otherwise it could cause false negative when ddl recovery done is part of the plugin initialization
1 parent 00862b6 commit fa8ce92

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

sql/handler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
782782
update_discovery_counters(hton, 1);
783783

784784
if (ddl_recovery_done && hton->signal_ddl_recovery_done)
785-
hton->signal_ddl_recovery_done(hton);
785+
ret= hton->signal_ddl_recovery_done(hton);
786786

787787
DBUG_RETURN(ret);
788788

storage/spider/spd_table.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6511,8 +6511,10 @@ bool spider_init_system_tables()
65116511

65126512

65136513
/*
6514-
Spider is typically loaded before ddl_recovery, but DDL statements
6515-
cannot be executed before ddl_recovery, so we delay system table creation.
6514+
Spider may be loaded before ddl_recovery (e.g. with
6515+
--plugin-load-add), but DDL statements in spider init queries cannot
6516+
be executed before ddl_recovery, so we execute these queries only
6517+
after ddl recovery.
65166518
*/
65176519
static int spider_after_ddl_recovery(handlerton *)
65186520
{

0 commit comments

Comments
 (0)