bk commit into 5.1 tree (msvensson:1.2599)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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-04-25 14:07:17+02:00, msvensson@stripped +3 -0
  Make it possible to specify test specifi config file as <testname>.cnf

  mysql-test/lib/mtr_cases.pm@stripped, 2008-04-25 14:07:15+02:00, msvensson@stripped
+9 -0
    Make it possible to specify test specifi config file as <testname>.cnf

  mysql-test/suite/rpl/t/rpl_000015.cnf@stripped, 2008-04-25 14:07:15+02:00,
msvensson@stripped +1 -1
    Use test specific config file

  mysql-test/suite/rpl/t/rpl_000015.cnf@stripped, 2008-04-25 13:54:38+02:00,
msvensson@stripped +0 -0
    Rename: mysql-test/suite/rpl/t/rpl_000015-master.opt ->
mysql-test/suite/rpl/t/rpl_000015.cnf

  mysql-test/suite/rpl/t/rpl_rotate_logs.cnf@stripped, 2008-04-25 14:07:15+02:00,
msvensson@stripped +5 -2
    Use test specific config file

  mysql-test/suite/rpl/t/rpl_rotate_logs.cnf@stripped, 2008-04-25 14:04:44+02:00,
msvensson@stripped +0 -0
    Rename: mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt ->
mysql-test/suite/rpl/t/rpl_rotate_logs.cnf

diff -Nrup a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
--- a/mysql-test/lib/mtr_cases.pm	2008-04-25 10:51:04 +02:00
+++ b/mysql-test/lib/mtr_cases.pm	2008-04-25 14:07:15 +02:00
@@ -755,6 +755,15 @@ sub collect_one_test_case {
   process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
 
   # ----------------------------------------------------------------------
+  # Check for test specific config file
+  # ----------------------------------------------------------------------
+  my $test_cnf_file= "$testdir/$tname.cnf";
+  if ( -f $test_cnf_file ) {
+    # Specifies the configuration file to use for this test
+    $tinfo->{'template_path'}= $test_cnf_file;
+  }
+
+  # ----------------------------------------------------------------------
   # master sh
   # ----------------------------------------------------------------------
   my $master_sh= "$testdir/$tname-master.sh";
diff -Nrup a/mysql-test/suite/rpl/t/rpl_000015-master.opt
b/mysql-test/suite/rpl/t/rpl_000015-master.opt
--- a/mysql-test/suite/rpl/t/rpl_000015-master.opt	2007-12-12 18:19:04 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,2 +0,0 @@
---config-file-template=../rpl_1slave_base.cnf
-
diff -Nrup a/mysql-test/suite/rpl/t/rpl_000015.cnf b/mysql-test/suite/rpl/t/rpl_000015.cnf
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_000015.cnf	2008-04-25 14:07:15 +02:00
@@ -0,0 +1,2 @@
+!include ../rpl_1slave_base.cnf
+
diff -Nrup a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
b/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
--- a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt	2007-12-12 18:18:54 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
--O max_binlog_size=4096
---config-file-template=../rpl_1slave_base.cnf
-
diff -Nrup a/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf	2008-04-25 14:07:15 +02:00
@@ -0,0 +1,6 @@
+!include ../rpl_1slave_base.cnf
+
+[mysqld.1]
+max_binlog_size=4096
+
+