database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.5.39 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-08-07 18:06:56 +02:00
parent 2023fac281 a4ab2431a2
commit 6fb17a0601
246 changed files with 5937 additions and 4671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_plugin.cc
View File

@@ -1613,7 +1613,7 @@ int plugin_init(int *argc, char **argv, int flags)
if (plugin_initialize(&tmp_root, plugin_ptr, argc, argv, !is_myisam &&
(flags & PLUGIN_INIT_SKIP_INITIALIZATION)))
{
if (mandatory)
if (plugin_ptr->load_option == PLUGIN_FORCE)
goto err_unlock;
plugin_ptr->state= PLUGIN_IS_DISABLED;
}