diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-08-13 13:35:36 +0200 |
| commit | fcf87600a2d7ae03f7bda16c2f16cdec980d2a56 (patch) | |
| tree | 0dd158f601c1b38f1b5e80eab137cd406c4499cb /sql/sql_plugin.cc | |
| parent | a6617eb341c9598f1247e8ddc5c66b7bec55129d (diff) | |
| download | mariadb-git-fcf87600a2d7ae03f7bda16c2f16cdec980d2a56.tar.gz | |
MDEV-4865 Change related to --log option/variable was merged partially
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 941587150f3..6d2a33450de 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -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); } |