From 595cf636fd9b07f64dd12d6ca9585a269fc67f45 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 19 Jan 2015 16:29:18 +0100 Subject: MDEV-7475 Wrong implementation of checking PLUGIN_VAR_SET condition correct the check for PLUGIN_VAR_STR --- sql/sql_plugin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_plugin.cc') diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index e1784c1f027..d1838bab4c9 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -3916,7 +3916,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp, we copy string values to a plugin's memroot. */ if (mysqld_server_started && - ((o->flags & (PLUGIN_VAR_STR | PLUGIN_VAR_NOCMDOPT | + ((o->flags & (PLUGIN_VAR_TYPEMASK | PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC)) == PLUGIN_VAR_STR)) { sysvar_str_t* str= (sysvar_str_t *)o; -- cgit v1.2.1