bzr commit into mysql-6.0 branch (kgeorge:2665)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/bzr/disable-federated-6.0/

 2665 Georgi Kodinov	2008-06-03 [merge]
      auto-merge
modified:
  mysql-test/lib/mtr_cases.pl
  sql/sql_plugin.cc

=== modified file 'mysql-test/lib/mtr_cases.pl'
--- a/mysql-test/lib/mtr_cases.pl	2008-02-11 16:11:22 +0000
+++ b/mysql-test/lib/mtr_cases.pl	2008-06-03 14:17:33 +0000
@@ -773,6 +773,13 @@ sub collect_one_test_case($$$$$$$$$) {
 	if ( $::used_default_engine =~ /^innodb/i );
     }
 
+    #enable federated for this test
+    if ($tinfo->{'federated_test'})
+    {
+      push(@{$tinfo->{'master_opt'}}, "--loose-federated");
+      push(@{$tinfo->{'slave_opt'}}, "--loose-federated");
+    }
+
     if ( $tinfo->{'big_test'} and ! $::opt_big_test )
     {
       $tinfo->{'skip'}= 1;
@@ -891,6 +898,8 @@ our @tags=
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
  ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["require_manager", "require_manager", 1],
+ ["include/federated.inc", "federated_test", 1],
+ ["include/have_federated_db.inc", "federated_test", 1],
 );
 
 sub mtr_options_from_test_file($$) {

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2008-05-08 16:01:15 +0000
+++ b/sql/sql_plugin.cc	2008-06-03 14:17:33 +0000
@@ -1146,9 +1146,10 @@ int plugin_init(int *argc, char **argv, 
   {
     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;