From: Date: February 27 2009 1:10pm
Subject: bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2758) Bug#39026 Bug#43256
List-Archive: http://lists.mysql.com/commits/67837
X-Bug: 39026,43256
Message-Id: <20090227121031.19293.qmail@khepri03>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/mysql/43256-51/

 2758 Bjorn Munch	2009-02-27
      Bug #43256 Bug#39026 got re-surrected
      Problems with use of share/mysql dir
      Explicitly look for "english" language file
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-02-23 14:52:23 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-02-27 12:07:01 +0000
@@ -932,12 +932,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())