commit into mysql-6.0 branch (horst:2665)

[Horst Hunger]

#At file:///work/bzr/mysql-6.0-bugs/

 2665 Horst Hunger	2008-06-18 [merge]
      merge of system variable tests.
modified:
  .bzrignore
  mysql-test/lib/mtr_cases.pl
  mysql-test/t/disabled.def
  mysql-test/t/rpl_slave_transaction_retries_basic_32.test
  mysql-test/t/rpl_slave_transaction_retries_basic_64.test
  mysql-test/t/rpl_sync_binlog_basic_32.test
  mysql-test/t/rpl_sync_binlog_basic_64.test
  sql/sql_plugin.cc


=== modified file '.bzrignore'
--- a/.bzrignore	2008-05-16 16:30:05 +0000
+++ b/.bzrignore	2008-06-18 16:39:02 +0000
@@ -3044,3 +3044,6 @@
 ylwrap
 zlib/*.ds?
 zlib/*.vcproj
+mysql-test/t/disable.def
+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-18 16:39:02 +0000
@@ -773,6 +773,13 @@
 	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 @@
  ["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 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-06-02 15:47:07 +0000
+++ b/mysql-test/t/disabled.def	2008-06-18 16:39:02 +0000
@@ -31,6 +31,7 @@
 cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64
 subselect_notembedded  : Bug#35803, Bug#33506 2008-Apr-03 subselect_notembedded crashes
the server
 user_limits     : Bug#23921 random failure of user_limits.test
+<<<<<<< TREE
 key_buffer_size_basic_64    : Bug #36522: Some tests of system variables have diffs on
64bit platorms
 rpl_recovery_rank_basic_64  : Bug #36522: Some tests of system variables have diffs on
64bit platorms
 sort_buffer_size_basic_64   : Bug #36522: Some tests of system variables have diffs on
64bit platorms
@@ -43,3 +44,7 @@
 key_buffer_size_basic_32    : Bug#36876 main.key_buffer_size_basic_32 fails on some
systems
 max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some
systems
 tmp_table_size_basic_32     : Bug#36878 main.tmp_table_size_basic_32 fails on some
systems
+=======
+status               : Bug#32966 main.status fails
+thread_cache_size_func : Bug#36733 main.thread_cache_size_func fails randomly
+>>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/t/rpl_slave_transaction_retries_basic_32.test'
--- a/mysql-test/t/rpl_slave_transaction_retries_basic_32.test	2008-05-14 23:24:13 +0000
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_32.test	2008-06-18 16:39:02 +0000
@@ -5,5 +5,6 @@
 ################################################################################
 
 --source include/have_32bit.inc
+--source include/not_embedded.inc
 --source include/slave_transaction_retries_basic.inc
 

=== modified file 'mysql-test/t/rpl_slave_transaction_retries_basic_64.test'
--- a/mysql-test/t/rpl_slave_transaction_retries_basic_64.test	2008-05-14 23:24:13 +0000
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_64.test	2008-06-18 16:39:02 +0000
@@ -5,5 +5,6 @@
 ################################################################################
 
 --source include/have_64bit.inc
+--source include/not_embedded.inc
 --source include/slave_transaction_retries_basic.inc
 

=== modified file 'mysql-test/t/rpl_sync_binlog_basic_32.test'
--- a/mysql-test/t/rpl_sync_binlog_basic_32.test	2008-05-16 02:44:49 +0000
+++ b/mysql-test/t/rpl_sync_binlog_basic_32.test	2008-06-18 16:39:02 +0000
@@ -5,5 +5,6 @@
 ################################################################################
 
 --source include/have_32bit.inc
+--source include/not_embedded.inc
 --source include/sync_binlog_basic.inc
 

=== modified file 'mysql-test/t/rpl_sync_binlog_basic_64.test'
--- a/mysql-test/t/rpl_sync_binlog_basic_64.test	2008-05-16 02:44:49 +0000
+++ b/mysql-test/t/rpl_sync_binlog_basic_64.test	2008-06-18 16:39:02 +0000
@@ -5,5 +5,6 @@
 ################################################################################
 
 --source include/have_64bit.inc
+--source include/not_embedded.inc
 --source include/sync_binlog_basic.inc
 

=== 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-18 16:39:02 +0000
@@ -1146,9 +1146,10 @@
   {
     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;