Skip to content

Commit

Permalink
MDEV-9312: storage engine not enforced during galera cluster replication
Browse files Browse the repository at this point in the history
Postfix: The pre-initialization of wsrep threads is not needed
for mysqldump sst method.
  • Loading branch information
Nirbhay Choubey committed Nov 7, 2016
1 parent 7241258 commit 9d89c18
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 3 additions & 1 deletion sql/mysqld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5424,8 +5424,10 @@ static int init_server_components()
initialized. This initialization was not possible before, as plugins
(and thus some global system variables) are initialized after wsrep
startup threads are created.
Note: This only needs to be done for rsync, xtrabackup based SST methods.
*/
wsrep_plugins_post_init();
if (wsrep_before_SE())
wsrep_plugins_post_init();

if (WSREP_ON && !opt_bin_log)
{
Expand Down
6 changes: 5 additions & 1 deletion sql/wsrep_mysqld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,12 @@ void wsrep_init_startup (bool first)
Pre-initialize global_system_variables.table_plugin with a dummy engine
(placeholder) required during the initialization of wsrep threads (THDs).
(see: plugin_thdvar_init())
Note: This only needs to be done for rsync & xtrabackup based SST methods.
In case of mysqldump SST method, the wsrep threads are created after the
server plugins & global system variables are initialized.
*/
wsrep_plugins_pre_init();
if (wsrep_before_SE())
wsrep_plugins_pre_init();

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

0 comments on commit 9d89c18

Please sign in to comment.