mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-34682 Return the return value of ddl recovery done in ha_initialize_handlerton

Browse source 
Otherwise it could cause false negative when ddl recovery done is part
of the plugin initialization
This commit is contained in:
Yuchen Pei 2024-08-02 10:31:08 +10:00
parent 00862b688c
commit fa8ce92cc0
No known key found for this signature in database
GPG key ID: 3DD1B35105743563
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/handler.cc
View file

@ -782,7 +782,7 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
update_discovery_counters(hton, 1);
if (ddl_recovery_done && hton->signal_ddl_recovery_done)
hton->signal_ddl_recovery_done(hton);
ret= hton->signal_ddl_recovery_done(hton);
DBUG_RETURN(ret);

6
storage/spider/spd_table.cc
View file

@ -6511,8 +6511,10 @@ bool spider_init_system_tables()
/*
Spider is typically loaded before ddl_recovery, but DDL statements
cannot be executed before ddl_recovery, so we delay system table creation.
Spider may be loaded before ddl_recovery (e.g. with
--plugin-load-add), but DDL statements in spider init queries cannot
be executed before ddl_recovery, so we execute these queries only
after ddl recovery.
*/
static int spider_after_ddl_recovery(handlerton *)
{