diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-06-23 19:07:20 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-06-23 20:33:13 +0300 |
| commit | ddeeb42e0b1adc2158fa0baec70d84a0ae3e5828 (patch) | |
| tree | 148912bb6b066faa1b3e56e2887a57cbe11b875c /sql/sql_plugin.cc | |
| parent | 75833ef9c51e3a2cc57fea048e55ed5670df7b0d (diff) | |
| parent | cf40393471b10ca68cc1d2804c22ab9203900978 (diff) | |
| download | mariadb-git-ddeeb42e0b1adc2158fa0baec70d84a0ae3e5828.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 79f0567971a..29cc4d17c87 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -228,6 +228,7 @@ static DYNAMIC_ARRAY plugin_array; static HASH plugin_hash[MYSQL_MAX_PLUGIN_TYPE_NUM]; static MEM_ROOT plugin_mem_root; static bool reap_needed= false; +volatile int global_plugin_version= 1; static bool initialized= 0; ulong dlopen_count; @@ -2193,6 +2194,7 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, reap_plugins(); } err: + global_plugin_version++; mysql_mutex_unlock(&LOCK_plugin); if (argv) free_defaults(argv); @@ -2340,6 +2342,7 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name, } reap_plugins(); + global_plugin_version++; mysql_mutex_unlock(&LOCK_plugin); DBUG_RETURN(error); |