From 6dbfe7f399d121dc2a040b21c96777c0a47141fb Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 3 Oct 2016 12:02:46 -0400 Subject: 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. --- sql/sql_plugin.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sql/sql_plugin.cc') 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; } } -- cgit v1.2.1