bzr push into mysql-5.1 branch (tomas.ulin:2681 to 2682) Bug#39026

[Tomas Ulin]

 2682 Tomas Ulin	2008-08-26
      bug#39026
modified:
  mysql-test/mysql-test-run.pl

 2681 Jonas Oreland	2008-08-24 [merge]
      merge 6.2 to 6.3
modified:
  storage/ndb/test/run-test/atrt-backtrace.sh

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-08 12:32:37 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-26 10:05:18 +0000
@@ -796,11 +796,11 @@ sub command_line_setup () {
 				       "$glob_basedir/bin");
 
   # Look for language files and charsetsdir, use same share
-  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
-                                    "$glob_basedir/sql/share",
-                                    "$glob_basedir/share");
+  $path_language=   mtr_path_exists("$glob_basedir/share/mysql/english",
+                                    "$glob_basedir/sql/share/english",
+                                    "$glob_basedir/share/english");
 
-  $path_language=      mtr_path_exists("$path_share/english");
+  $path_share= dirname($path_language);
   $path_charsetsdir=   mtr_path_exists("$path_share/charsets");