bk commit into 5.1 tree (istruewing:1.2568)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing.  When istruewing does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-07 11:58:04+02:00, istruewing@stripped +1 -0
  Disable FEDERATED by default.
  
  Not to be pushed.
  
  This patch demonstrates, how to make FEDERATED disabled by default.

  sql/sql_plugin.cc@stripped, 2008-05-07 11:58:02+02:00, istruewing@stripped +3 -2
    Disable FEDERATED by default.

diff -Nrup a/sql/sql_plugin.cc b/sql/sql_plugin.cc
--- a/sql/sql_plugin.cc	2008-03-28 17:43:11 +01:00
+++ b/sql/sql_plugin.cc	2008-05-07 11:58:02 +02:00
@@ -1137,9 +1137,10 @@ int plugin_init(int *argc, char **argv, 
   {
     for (plugin= *builtins; plugin->info; plugin++)
     {
-      /* by default, only ndbcluster is disabled */
+      /* by default, the below are disabled */
       def_enabled=
-        my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0;
+        my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") &&
+        my_strcasecmp(&my_charset_latin1, plugin->name, "FEDERATED");
       bzero(&tmp, sizeof(tmp));
       tmp.plugin= plugin;
       tmp.name.str= (char *)plugin->name;