diff options
| author | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2008-01-26 02:13:35 -0800 |
|---|---|---|
| committer | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2008-01-26 02:13:35 -0800 |
| commit | 82839a0bbb0e33fffbf7a8905aa9566eb7d185a6 (patch) | |
| tree | ae1af229bf62fd7092f8461aed54eb418651f211 /sql/sql_plugin.cc | |
| parent | 98515df2132b9f53e9895fd1a7b3f15ee5638a8e (diff) | |
| download | mariadb-git-82839a0bbb0e33fffbf7a8905aa9566eb7d185a6.tar.gz | |
fixes to make pushbuild tests green
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 8e204eb3d51..bae4a85fd8a 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1181,9 +1181,8 @@ int plugin_init(int *argc, char **argv, int flags) /* Register all dynamic plugins */ if (!(flags & PLUGIN_INIT_SKIP_DYNAMIC_LOADING)) { - if (opt_plugin_load && - plugin_load_list(&tmp_root, argc, argv, opt_plugin_load)) - goto err; + if (opt_plugin_load) + plugin_load_list(&tmp_root, argc, argv, opt_plugin_load); if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE)) plugin_load(&tmp_root, argc, argv); } |