summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@mariadb.com>2020-04-23 04:49:24 +0300
committerElena Stepanova <elenst@mariadb.com>2020-04-23 18:54:36 +0300
commit5d856760fb3941b4a36cc484e28c500236c45ac1 (patch)
treed8e5ed3899f982cec383ecd26927bd242d594ecd
parentad4b70562bb94dd063eebde5189c6e730d3120a2 (diff)
downloadmariadb-git-5d856760fb3941b4a36cc484e28c500236c45ac1.tar.gz
MDEV-22349 MTR re-bootstrap modifies environment variable MYSQLD_BOOTSTRAP_CMD
-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 fc152b232ca..80abc0fbb82 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3167,7 +3167,8 @@ sub mysql_install_db {
# ----------------------------------------------------------------------
# export MYSQLD_BOOTSTRAP_CMD variable containing <path>/mysqld <args>
# ----------------------------------------------------------------------
- $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args);
+ $ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args)
+ unless defined $ENV{'MYSQLD_BOOTSTRAP_CMD'};
# Extra options can come not only from the command line, but also
# from option files or combinations. We want them on a command line