database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Deinitialize plugins in the reverse plugin_type_initialization_order

Browse Source 
Old code worked because plugin locking guaranteed that
encryption plugin is deinitialized last.
But compiled-in plugins are never locked.

This fixes encryption failures on fulltest builder
This commit is contained in:
Sergei Golubchik
2015-06-22 17:17:03 +02:00
parent ff7a1ff6d7
commit bfabaf6486
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_plugin.cc
View File

@ -1252,7 +1252,7 @@ static void plugin_del(struct st_plugin_int *plugin)
static void reap_plugins(void) static void reap_plugins(void)
{ {
uint count, idx; uint count;
struct st_plugin_int *plugin, **reap, **list; struct st_plugin_int *plugin, **reap, **list;
mysql_mutex_assert_owner(&LOCK_plugin); mysql_mutex_assert_owner(&LOCK_plugin);
@ -1265,14 +1265,18 @@ static void reap_plugins(void)
reap= (struct st_plugin_int **)my_alloca(sizeof(plugin)*(count+1)); reap= (struct st_plugin_int **)my_alloca(sizeof(plugin)*(count+1));
*(reap++)= NULL; *(reap++)= NULL;
for (idx= 0; idx < count; idx++) for (uint i=0; i < MYSQL_MAX_PLUGIN_TYPE_NUM; i++)
{ {
plugin= *dynamic_element(&plugin_array, idx, struct st_plugin_int **); HASH *hash= plugin_hash + plugin_type_initialization_order[i];
if (plugin->state == PLUGIN_IS_DELETED && !plugin->ref_count) for (uint j= 0; j < hash->records; j++)
{ {
/* change the status flag to prevent reaping by another thread */ plugin= (struct st_plugin_int *) my_hash_element(hash, j);
plugin->state= PLUGIN_IS_DYING; if (plugin->state == PLUGIN_IS_DELETED && !plugin->ref_count)
*(reap++)= plugin; {
/* change the status flag to prevent reaping by another thread */
plugin->state= PLUGIN_IS_DYING;
*(reap++)= plugin;
}
} }
} }
@ -3359,9 +3363,9 @@ bool sys_var_pluginvar::session_is_default(THD *thd)
} }
case PLUGIN_VAR_DOUBLE: case PLUGIN_VAR_DOUBLE:
return getopt_ulonglong2double(option.def_value) == *(double*)value; return getopt_ulonglong2double(option.def_value) == *(double*)value;
default:
DBUG_ASSERT(0);
} }
DBUG_ASSERT(0);
return 0;
} }