diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 16:29:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 16:29:18 +0100 |
| commit | 595cf636fd9b07f64dd12d6ca9585a269fc67f45 (patch) | |
| tree | 9e5bc892b74a976e8c6f3653a7894968ad411a20 /sql/sql_plugin.cc | |
| parent | 5d0d6cb129f64bfaed2128d2bcc366aeee44e5ad (diff) | |
| download | mariadb-git-595cf636fd9b07f64dd12d6ca9585a269fc67f45.tar.gz | |
MDEV-7475 Wrong implementation of checking PLUGIN_VAR_SET condition
correct the check for PLUGIN_VAR_STR
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |