summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-02-03 16:59:26 +0100
committerSergei Golubchik <serg@mariadb.org>2021-02-22 19:43:08 +0100
commit7fe351aba4e4e17e1be2599fa36ff73a0ce103f9 (patch)
tree52b70c6251bf43c74d37b6cf374adf7a37dffce0 /mysql-test
parent77c23c62ae28611f660ea4a8b25525c3cfe2871f (diff)
downloadmariadb-git-7fe351aba4e4e17e1be2599fa36ff73a0ce103f9.tar.gz
mtr fixes for old (5.10.1) perl
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/lib/My/Debugger.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm
index f6aa41269cb..d2add55d680 100644
--- a/mysql-test/lib/My/Debugger.pm
+++ b/mysql-test/lib/My/Debugger.pm
@@ -4,6 +4,7 @@ use strict;
use warnings;
use Text::Wrap;
use Cwd;
+use My::Platform;
# 1. options to support:
# --xxx[=ARGS]
@@ -139,8 +140,8 @@ sub do_args($$$$$) {
# on windows mtr args are quoted (for system), otherwise not (for exec)
sub quote($) { $_[0] =~ / / ? "\"$_[0]\"" : $_[0] }
sub unquote($) { $_[0] =~ s/^"(.*)"$/$1/; $_[0] }
- sub quote_from_mtr($) { ::IS_WINDOWS ? $_[0] : quote($_[0]) }
- sub unquote_for_mtr($) { ::IS_WINDOWS ? $_[0] : unquote($_[0]) }
+ sub quote_from_mtr($) { IS_WINDOWS() ? $_[0] : quote($_[0]) }
+ sub unquote_for_mtr($) { IS_WINDOWS() ? $_[0] : unquote($_[0]) }
my %vars = (
vardir => $::opt_vardir,
@@ -240,7 +241,7 @@ sub setup_client_args($$) {
if ($opt_vals{$opt}) {
die "--$opt and --$found cannot be used at the same time$embedded\n" if $found;
$found=$opt;
- do_args($args, $exe, ::IS_WINDOWS ? 'NUL' : '/dev/null', 'client', $found);
+ do_args($args, $exe, IS_WINDOWS() ? 'NUL' : '/dev/null', 'client', $found);
}
}
}
@@ -255,7 +256,7 @@ sub setup_args($$$) {
if ($opt_vals{$opt}) {
die "--$opt and --$found cannot be used at the same time\n" if $found;
$found=$opt;
- do_args($args, $exe, ::IS_WINDOWS ? 'NUL' : '/dev/null', $type, $found);
+ do_args($args, $exe, IS_WINDOWS() ? 'NUL' : '/dev/null', $type, $found);
}
}
}