summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-09-23 15:42:11 +0200
committerAlexey Bychko <alexey.bychko@mariadb.com>2020-09-24 12:56:44 +0700
commit5037acda36f3f18daf66c5ccd50cc873966b22eb (patch)
tree3222fb646b0b63172e768a0b847754ba300f2d51
parent7d0603c65363b78b7f66f5cf00c93c51625c5a73 (diff)
downloadmariadb-git-5037acda36f3f18daf66c5ccd50cc873966b22eb.tar.gz
Window , MTR : fix lookup for mysql_install_db.exe
Fixes (rare) case when mysql-test is included into "noinstall" ZIP.
-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 306458742eb..ffa9b1aec65 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2359,7 +2359,8 @@ sub environment_setup {
$ENV{'MARIADB_CONV'}= $exe_mariadb_conv;
if(IS_WINDOWS)
{
- $ENV{'MYSQL_INSTALL_DB_EXE'}= mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db");
+ $ENV{'MYSQL_INSTALL_DB_EXE'}= mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db",
+ "$bindir/bin/mysql_install_db");
}
my $client_config_exe=