bk commit into 5.1 tree (skozlov:1.2596)

[Serge Kozlov]

Below is the list of changes that have just been committed into a local
5.1 repository of skozlov.  When skozlov 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 22:54:20+04:00, skozlov@stripped +2 -0
  WL#3754 Fix for mtr, added support personal configuration for test cases

  mysql-test/lib/mtr_cases.pm@stripped, 2008-04-25 22:54:17+04:00, skozlov@stripped +10 -0
    updated library

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result@stripped, 2008-04-25 22:54:17+04:00,
skozlov@stripped +2 -1
    result file for test case

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-24 16:15:13 +04:00
+++ b/mysql-test/lib/mtr_cases.pm	2008-04-25 22:54:17 +04:00
@@ -748,6 +748,16 @@ sub collect_one_test_case {
   # Add slave opts, list of extra option only for slave
   # ----------------------------------------------------------------------
   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
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result	2008-04-25 00:41:02 +04:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result	2008-04-25 22:54:17 +04:00
@@ -97,5 +97,6 @@ COUNT(*)	SUM(a)	b
 100	64100	master1
 100	64000	slave
 
-DELETE FROM t1;
+DROP TABLE t1;
+DROP TABLE t1;