summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-11-14 02:00:51 +0200
committerunknown <kent@mysql.com>2005-11-14 02:00:51 +0200
commit40bb067e268a004fac9eafa876fb1bad31903d01 (patch)
tree38a0e90e8143310bf445268967e8e6e22d36dd4e
parentcde1be69d673d66ad1dec4b7b90a0320e8e3e83b (diff)
parentc2826d723e6581ce18a6e0974b47669b99da1d14 (diff)
downloadmariadb-git-40bb067e268a004fac9eafa876fb1bad31903d01.tar.gz
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c3025060e37..58308f0ccdd 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -871,7 +871,7 @@ sub executable_setup () {
"/usr/bin/false");
}
$exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
- $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport");
+ $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport");
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
$exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin");
@@ -885,6 +885,7 @@ sub executable_setup () {
{
$path_client_bindir= mtr_path_exists("$glob_basedir/bin");
$exe_mysqldump= mtr_exe_exists("$path_client_bindir/mysqldump");
+ $exe_mysqlimport= mtr_exe_exists("$path_client_bindir/mysqlimport");
$exe_mysqlshow= mtr_exe_exists("$path_client_bindir/mysqlshow");
$exe_mysqlbinlog= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
$exe_mysqladmin= mtr_exe_exists("$path_client_bindir/mysqladmin");