diff options
| author | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2008-01-26 02:13:35 -0800 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2008-01-26 02:13:35 -0800 |
| commit | 70884e09b8d10088da4598aaf0b8ebe04e6a97b8 (patch) | |
| tree | ae1af229bf62fd7092f8461aed54eb418651f211 /sql/sql_plugin.cc | |
| parent | f1042103e619330f5b1fdd11faed7d07c79df49f (diff) | |
| download | mariadb-git-70884e09b8d10088da4598aaf0b8ebe04e6a97b8.tar.gz | |
fixes to make pushbuild tests green
mysql-test/t/plugin_load-master.opt:
add '--loose' modifier to allow test to be skipped if plugin is not available.
sql/sql_plugin.cc:
Failure to load a plugin from command line option made non-fatal as plugin
load failures from plugin table is already non-fatal.
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); } |