From ea120c56f573c1448c54479c7904ada891320ca5 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Fri, 30 May 2008 13:21:45 +0300 Subject: Bug#37069: Make federated disabled by default The federated storage engine is now disabled by default. mysql-test-run.pl is updated to enable it whenever it's required and available. mysql-test/lib/mtr_cases.pl: Bug#37069: mysql-test-run.pl automatically enables federated for federated related tests sql/sql_plugin.cc: Bug#37069: federated is disabled by default --- sql/sql_plugin.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql/sql_plugin.cc') diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 811b82ebe05..0fe79a8945d 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1137,9 +1137,10 @@ int plugin_init(int *argc, char **argv, int flags) { for (plugin= *builtins; plugin->info; plugin++) { - /* by default, only ndbcluster is disabled */ + /* by default, ndbcluster and federated are disabled */ def_enabled= - my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0; + my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0 && + my_strcasecmp(&my_charset_latin1, plugin->name, "FEDERATED") != 0; bzero(&tmp, sizeof(tmp)); tmp.plugin= plugin; tmp.name.str= (char *)plugin->name; -- cgit v1.2.1