From: Date: August 29 2008 6:25pm
Subject: bzr commit into mysql-5.1 branch (msvensson:2667) Bug#39026
List-Archive: http://lists.mysql.com/commits/52923
X-Bug: 39026
Message-Id: <20080829162536.32FA030E84C@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/msvensson/mysql/5.1-rpl-latest/

 2667 Magnus Svensson	2008-08-29
      bug#39026
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-29 12:46:22 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-29 16:25:28 +0000
@@ -858,11 +858,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");
 
   # Look for SQL scripts directory