Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7fe351ab
Commit
7fe351ab
authored
Feb 03, 2021
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtr fixes for old (5.10.1) perl
parent
77c23c62
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
mysql-test/lib/My/Debugger.pm
mysql-test/lib/My/Debugger.pm
+5
-4
No files found.
mysql-test/lib/My/Debugger.pm
View file @
7fe351ab
...
...
@@ -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
);
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment