summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorsayantan dutta <sayantan.dutta@oracle.com>2013-05-16 14:19:57 +0530
committersayantan dutta <sayantan.dutta@oracle.com>2013-05-16 14:19:57 +0530
commit4639c7ec7fab240ab796d14a8ab113d7c257db74 (patch)
tree0d129e2190bf8141f2718d13fdde8c423fda49d2 /mysql-test/mysql-test-run.pl
parent8756841ae3360f3705c9b55e91fee6112fe9b142 (diff)
parent0bec3c414262f8de0518df19dfd762435c859ea4 (diff)
downloadmariadb-git-4639c7ec7fab240ab796d14a8ab113d7c257db74.tar.gz
Bug 16813007 5.1 => 5.5
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl12
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 01c4150d083..19f82303221 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2031,7 +2031,17 @@ sub executable_setup () {
}
else
{
- $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+ if ( defined $ENV{'MYSQL_TEST'} )
+ {
+ $exe_mysqltest=$ENV{'MYSQL_TEST'};
+ print "===========================================================\n";
+ print "WARNING:The mysqltest binary is fetched from $exe_mysqltest\n";
+ print "===========================================================\n";
+ }
+ else
+ {
+ $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+ }
}
}