[Commits] de1b145: MDEV-9312: storage engine not enforced during galera cluster replication

[Nirbhay Choubey]

revision-id: de1b145cc2786df6546322b6248479f5f5aba19f (mariadb-10.1.17-41-gde1b145)
parent(s): ad2076945062f7f6d29752641048071229435391
author: Nirbhay Choubey
committer: Nirbhay Choubey
timestamp: 2016-09-29 14:58:32 -0400
message:

MDEV-9312: storage engine not enforced during galera cluster replication

Postfix: The pre-initialization of wsrep threads is not needed
for mysqldump sst method.

---
 sql/mysqld.cc       | 4 +++-
 sql/wsrep_mysqld.cc | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f69416c..466a54b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5316,8 +5316,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)
   {
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 5f25ea1..0deb19d 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -786,8 +786,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;