maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2688 knielsen@xxxxxxxxxxxxxxx	2009-03-20
      Remove redundant code, probably bad automerge
      modified:
        mysql-test/lib/mtr_cases.pm

per-file messages:
  mysql-test/lib/mtr_cases.pm
    Remove redundant code, probably bad automerge
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-02-19 09:01:25 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-03-20 14:39:37 +0000
@@ -799,15 +799,6 @@ sub collect_one_test_case {
   push(@{$tinfo->{'master_opt'}}, @$suite_opts);
   push(@{$tinfo->{'slave_opt'}}, @$suite_opts);
 
-  #-----------------------------------------------------------------------
-  # 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;
-  }
-
   # ----------------------------------------------------------------------
   # Check for test specific config file
   # ----------------------------------------------------------------------