database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-4865 Change related to --log option/variable was merged partially

Browse Source 
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
This commit is contained in:
Sergei Golubchik
2013-08-13 13:35:36 +02:00
parent a6617eb341
commit fcf87600a2
58 changed files with 74 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_plugin.cc
View File

@ -1175,10 +1175,6 @@ static void plugin_deinitialize(struct st_plugin_int *plugin, bool ref_check)
}
plugin->state= PLUGIN_IS_UNINITIALIZED;
/* maintain the obsolete @@have_innodb variable */
if (!my_strcasecmp(&my_charset_latin1, plugin->name.str, "InnoDB"))
have_innodb= SHOW_OPTION_DISABLED;
/*
We do the check here because NDB has a worker THD which doesn't
exit until NDB is shut down.
@ -1403,11 +1399,6 @@ err:
mysql_mutex_lock(&LOCK_plugin);
plugin->state= state;
/* maintain the obsolete @@have_innodb variable */
if (!my_strcasecmp(&my_charset_latin1, plugin->name.str, "InnoDB"))
have_innodb= state & PLUGIN_IS_READY ? SHOW_OPTION_YES
: SHOW_OPTION_DISABLED;
DBUG_RETURN(ret);
}