diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-05-30 13:21:45 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-05-30 13:21:45 +0300 |
| commit | bd4c6d9b8ccf5f8a3f8f743dde1c882506e08c7c (patch) | |
| tree | 7ad2cfaf054cdbacd2bfb1585ce86468306279d7 /sql | |
| parent | 4215c0d625fc30da6d0375fd9375534e70c08e5d (diff) | |
| download | mariadb-git-bd4c6d9b8ccf5f8a3f8f743dde1c882506e08c7c.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_plugin.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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; |