diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2014-06-17 13:03:26 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2014-06-17 13:03:26 +0400 |
| commit | 3375e137f88b9cfe3cdd10dd968e3f87d169d373 (patch) | |
| tree | 612cce096cc7d95468bdd619bb130621f8532e00 /sql/sql_plugin.cc | |
| parent | ebf3437810797bccd43039459df5f8a4d3070b2e (diff) | |
| download | mariadb-git-3375e137f88b9cfe3cdd10dd968e3f87d169d373.tar.gz | |
MDEV-6351 - --plugin=force has no effect for built-in plugins
mysqld didn't fail to start if a compiled-in plugin failed to initialize
(--xxx=FORCE behaving as --xxx=ON)
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index fc856f11a89..e1784c1f027 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1612,7 +1612,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; } |