diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-03 12:02:46 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-11-02 09:45:43 -0400 |
| commit | 6dbfe7f399d121dc2a040b21c96777c0a47141fb (patch) | |
| tree | a163001fb399976fe797a41e1f9d8ab91224e3f3 | |
| parent | fa4fa0ab90e4e49dde955333667cc606838d8fa9 (diff) | |
| download | mariadb-git-6dbfe7f399d121dc2a040b21c96777c0a47141fb.tar.gz | |
MDEV-10944: GALERA log-slave-updates FAIL after upgrading from 10.1.17 to 10.1.18
thd->variables.option_bits need to be restored after
plugin_thdvar_init() during post initialization of
wsrep threads.
| -rw-r--r-- | sql/sql_plugin.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 5b16482ae66..ed0721feb3b 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -4271,7 +4271,13 @@ void wsrep_plugins_post_init() { if (IF_WSREP(thd->wsrep_applier,1)) { + // Save options_bits as it will get overwritten in plugin_thdvar_init() + ulonglong option_bits_saved= thd->variables.option_bits; + plugin_thdvar_init(thd); + + // Restore option_bits + thd->variables.option_bits= option_bits_saved; } } |