summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 08:40:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 08:40:19 +0300
commitca3f497564f93d2d70d024d996bcd1136bddc5ab (patch)
treec89f50b5dd0f2a23d6c1511844c5196909bc5325 /mysql-test/lib/My
parent9f03a394fff4ae55553eb694f7cba56db15fdb7b (diff)
parentb9a2e4609f93f2cab253f02bc7535960852de3c5 (diff)
downloadmariadb-git-ca3f497564f93d2d70d024d996bcd1136bddc5ab.tar.gz
Merge 10.2 into 10.3, except MDEV-25682
Diffstat (limited to 'mysql-test/lib/My')
-rw-r--r--mysql-test/lib/My/Debugger.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm
index 5e04c070e7f..cc151b233d5 100644
--- a/mysql-test/lib/My/Debugger.pm
+++ b/mysql-test/lib/My/Debugger.pm
@@ -139,7 +139,7 @@ sub do_args($$$$$) {
my $v = $debuggers{$k};
# on windows mtr args are quoted (for system), otherwise not (for exec)
- sub quote($) { $_[0] =~ / / ? "\"$_[0]\"" : $_[0] }
+ 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]) }