Commit 193314f4 authored by Sergei Golubchik's avatar Sergei Golubchik

show "dying" state in I_S.PLUGINS

parent 06a8412b
...@@ -99,7 +99,8 @@ BEGIN ...@@ -99,7 +99,8 @@ BEGIN
mysql.global_priv; mysql.global_priv;
-- verify that no plugin changed its disabled/enabled state -- verify that no plugin changed its disabled/enabled state
SELECT * FROM INFORMATION_SCHEMA.PLUGINS; SELECT * FROM INFORMATION_SCHEMA.PLUGINS
WHERE PLUGIN_STATUS != 'INACTIVE';
select * from information_schema.session_variables select * from information_schema.session_variables
where variable_name = 'debug_sync'; where variable_name = 'debug_sync';
......
...@@ -231,6 +231,9 @@ static my_bool show_plugins(THD *thd, plugin_ref plugin, ...@@ -231,6 +231,9 @@ static my_bool show_plugins(THD *thd, plugin_ref plugin,
case PLUGIN_IS_DISABLED: case PLUGIN_IS_DISABLED:
table->field[2]->store(STRING_WITH_LEN("DISABLED"), cs); table->field[2]->store(STRING_WITH_LEN("DISABLED"), cs);
break; break;
case PLUGIN_IS_DYING:
table->field[2]->store(STRING_WITH_LEN("INACTIVE"), cs);
break;
case PLUGIN_IS_FREED: // filtered in fill_plugins, used in fill_all_plugins case PLUGIN_IS_FREED: // filtered in fill_plugins, used in fill_all_plugins
table->field[2]->store(STRING_WITH_LEN("NOT INSTALLED"), cs); table->field[2]->store(STRING_WITH_LEN("NOT INSTALLED"), cs);
break; break;
...@@ -324,7 +327,7 @@ int fill_plugins(THD *thd, TABLE_LIST *tables, COND *cond) ...@@ -324,7 +327,7 @@ int fill_plugins(THD *thd, TABLE_LIST *tables, COND *cond)
TABLE *table= tables->table; TABLE *table= tables->table;
if (plugin_foreach_with_mask(thd, show_plugins, MYSQL_ANY_PLUGIN, if (plugin_foreach_with_mask(thd, show_plugins, MYSQL_ANY_PLUGIN,
~(PLUGIN_IS_FREED | PLUGIN_IS_DYING), table)) ~PLUGIN_IS_FREED, table))
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_RETURN(0); DBUG_RETURN(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment