From 95b65235bab4f211765708c281173c19aa36ac7c Mon Sep 17 00:00:00 2001
From: "skozlov/ksm@mysql.com/virtop.localdomain" <>
Date: Wed, 21 Nov 2007 13:25:14 +0300
Subject: WL#3949, fixed path to combination file

---
 mysql-test/lib/mtr_cases.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'mysql-test/lib')

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index d5741e24f05..5f025b63b38 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -218,14 +218,13 @@ sub collect_one_suite($$)
   my $combinations = [];
 
   my $suitedir= "$::glob_mysql_test_dir"; # Default
-  my $combination_file= "$::glob_mysql_test_dir/$combination_file";
   if ( $suite ne "main" )
   {
     $suitedir= mtr_path_exists("$suitedir/suite/$suite",
 			       "$suitedir/$suite");
     mtr_verbose("suitedir: $suitedir");
-    $combination_file= "$suitedir/$combination_file";
   }
+  my $combination_file= "$suitedir/$combination_file";
 
   my $testdir= "$suitedir/t";
   my $resdir=  "$suitedir/r";
-- 
cgit v1.2.1