From: Date: February 27 2009 4:09pm
Subject: bzr commit into mysql-5.1-telco-6.2 branch (msvensson:2863) Bug#39026
 Bug#43256
List-Archive: http://lists.mysql.com/commits/67868
X-Bug: 39026,43256
Message-Id: <20090227150929.E2433134040@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///home/msvensson/mysql/6.2/ based on revid:build@stripped

 2863 Magnus Svensson	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:54:13 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-02-27 15:09:25 +0000
@@ -944,12 +944,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())