summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-03-03 09:41:50 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-03-03 09:41:50 +0200
commitddbc6126920c1ad0300f7f9734348309f5073de7 (patch)
treef98a56b0fef476345979f3a228de8ffd27da0ea6 /mysql-test/mysql-test-run.pl
parent0f81ca6a0bb21fbba4bca93a7555f7c8e6357b47 (diff)
parent676987c4a14069d415c56d0f259aaaa7ca742c23 (diff)
downloadmariadb-git-ddbc6126920c1ad0300f7f9734348309f5073de7.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1383b431e55..ef76e40d0fe 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -5099,7 +5099,7 @@ sub mysqld_start ($$) {
$ENV{'MYSQLD_LAST_CMD'}= "$exe @$args";
My::Debugger::setup_args(\$args, \$exe, $mysqld->name());
- $ENV{'VALGRIND_TEST'}= $opt_valgrind = int($exe && $exe eq 'valgrind');
+ $ENV{'VALGRIND_TEST'}= $opt_valgrind = int(($exe || '') eq 'valgrind');
# Remove the old pidfile if any
unlink($mysqld->value('pid-file'));