diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-03 12:02:46 -0400 |
|---|---|---|
| committer | SachinSetiya <sachinsetia1001@gmail.com> | 2016-11-28 16:30:48 +0530 |
| commit | 136a3cd5f4946c0c29bc1aafdb60e423a36626a5 (patch) | |
| tree | 9dd322914326123cc2d7bd3f020e0b8575b468d0 | |
| parent | 6fba674498514bb5a4e534a51b5ee3ba1ddad95c (diff) | |
| download | mariadb-git-136a3cd5f4946c0c29bc1aafdb60e423a36626a5.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 fca26e00270..22a78f653b2 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -4323,7 +4323,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; } } |