From a892ad5c62125a7116c7da0aae7805af8c26ffd9 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Fri, 27 Feb 2009 13:07:01 +0100 Subject: [PATCH] Bug #43256 Bug#39026 got re-surrected Problems with use of share/mysql dir Explicitly look for "english" language file --- mysql-test/mysql-test-run.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 82ed1ff67fc..5e85cfe5cac 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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())