Skip to content

Commit 6925689

Browse files
author
Nirbhay Choubey
committed
MDEV-9312: storage engine not enforced during galera cluster replication
Postfix: The pre-initialization of wsrep threads is not needed for mysqldump sst method.
1 parent 235876d commit 6925689

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

sql/mysqld.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5316,8 +5316,10 @@ static int init_server_components()
53165316
initialized. This initialization was not possible before, as plugins
53175317
(and thus some global system variables) are initialized after wsrep
53185318
startup threads are created.
5319+
Note: This only needs to be done for rsync, xtrabackup based SST methods.
53195320
*/
5320-
wsrep_plugins_post_init();
5321+
if (wsrep_before_SE())
5322+
wsrep_plugins_post_init();
53215323

53225324
if (WSREP_ON && !opt_bin_log)
53235325
{

sql/wsrep_mysqld.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,8 +786,12 @@ void wsrep_init_startup (bool first)
786786
Pre-initialize global_system_variables.table_plugin with a dummy engine
787787
(placeholder) required during the initialization of wsrep threads (THDs).
788788
(see: plugin_thdvar_init())
789+
Note: This only needs to be done for rsync & xtrabackup based SST methods.
790+
In case of mysqldump SST method, the wsrep threads are created after the
791+
server plugins & global system variables are initialized.
789792
*/
790-
wsrep_plugins_pre_init();
793+
if (wsrep_before_SE())
794+
wsrep_plugins_pre_init();
791795

792796
/* Skip replication start if dummy wsrep provider is loaded */
793797
if (!strcmp(wsrep_provider, WSREP_NONE)) return;

0 commit comments

Comments
 (0)