List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:February 27 2009 12:51pm
Subject:bzr commit into mysql-6.0-mtr branch (Bjorn.Munch:2729)
View as plain text  
#At file:///home/bm136801/mysql/43256-60/

 2729 Bjorn Munch	2009-02-27 [merge]
      merge
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-02-26 10:30:22 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-02-27 12:50:07 +0000
@@ -962,12 +962,12 @@ sub command_line_setup {
   }
 
   # Look for language files and charsetsdir, use same share
-  my $path_share=      mtr_path_exists("$basedir/share/mysql",
-				       "$basedir/sql/share",
-				       "$basedir/share");
+  $path_language=   mtr_path_exists("$basedir/share/mysql/english",
+                                    "$basedir/sql/share/english",
+                                    "$basedir/share/english");
 
-  
-  $path_language=      mtr_path_exists("$path_share/english");
+
+  my $path_share= dirname($path_language);
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
 
   if (using_extern())

Thread
bzr commit into mysql-6.0-mtr branch (Bjorn.Munch:2729) Bjorn Munch27 Feb