diff options
author | msvensson@pilot.blaudden <> | 2007-03-19 11:15:59 +0100 |
---|---|---|
committer | msvensson@pilot.blaudden <> | 2007-03-19 11:15:59 +0100 |
commit | 709f0669483bc60dc2d72d60436eaa440e9b65cb (patch) | |
tree | 03513f9684a07a5f525ab42fea770ce28016381e /mysql-test/mysql-test-run.pl | |
parent | 5463575a4c8b65a38b5f8686817041c9c84fdfac (diff) | |
parent | 88b4c86e09abbb2687adef3c1e4f1e8700140737 (diff) | |
download | mariadb-git-709f0669483bc60dc2d72d60436eaa440e9b65cb.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9a0cbe32443..9700b7d671f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1495,9 +1495,17 @@ sub executable_setup () { if (!$opt_extern) { - # Look for SQL scripts directory - $path_sql_dir= mtr_path_exists("$glob_basedir/share", - "$glob_basedir/scripts"); + # Look for SQL scripts directory + if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "") + { + # The SQL scripts are in path_share + $path_sql_dir= $path_share; + } + else + { + $path_sql_dir= mtr_path_exists("$glob_basedir/share", + "$glob_basedir/scripts"); + } if ( $mysql_version_id >= 50100 ) { |