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
a7dc95fb
Commit
a7dc95fb
authored
Jan 07, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
backport some changes from WL 4378
parents
4eb3d765
be128c54
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
10 deletions
+29
-10
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+29
-10
No files found.
mysql-test/mysql-test-run.pl
View file @
a7dc95fb
...
@@ -68,8 +68,8 @@ use My::File::Path; # Patched version of File::Path
...
@@ -68,8 +68,8 @@ use My::File::Path; # Patched version of File::Path
use
File::
Basename
;
use
File::
Basename
;
use
File::
Copy
;
use
File::
Copy
;
use
File::
Find
;
use
File::
Find
;
use
File::
Temp
qw
/
tempdir
/
;
use
File::
Temp
qw
/tempdir
/
;
use
File::Spec::
Functions
qw
/
splitdir
/
;
use
File::Spec::
Functions
qw
/splitdir
/
;
use
My::
Platform
;
use
My::
Platform
;
use
My::
SafeProcess
;
use
My::
SafeProcess
;
use
My::
ConfigFactory
;
use
My::
ConfigFactory
;
...
@@ -119,6 +119,8 @@ END {
...
@@ -119,6 +119,8 @@ END {
}
}
}
}
sub
env_or_val
($$)
{
defined
$ENV
{
$_
[
0
]}
?
$ENV
{
$_
[
0
]}
:
$_
[
1
]
}
my
$path_config_file
;
# The generated config file, var/my.cnf
my
$path_config_file
;
# The generated config file, var/my.cnf
# Visual Studio produces executables in different sub-directories based on the
# Visual Studio produces executables in different sub-directories based on the
...
@@ -217,7 +219,7 @@ my $start_only;
...
@@ -217,7 +219,7 @@ my $start_only;
my
$opt_wait_all
;
my
$opt_wait_all
;
my
$opt_repeat
=
1
;
my
$opt_repeat
=
1
;
my
$opt_retry
=
3
;
my
$opt_retry
=
3
;
my
$opt_retry_failure
=
2
;
my
$opt_retry_failure
=
env_or_val
(
MTR_RETRY_FAILURE
=>
2
)
;
my
$opt_strace_client
;
my
$opt_strace_client
;
...
@@ -247,9 +249,9 @@ our %mysqld_variables;
...
@@ -247,9 +249,9 @@ our %mysqld_variables;
my
$source_dist
=
0
;
my
$source_dist
=
0
;
my
$opt_max_save_core
=
$ENV
{
MTR_MAX_SAVE_CORE
}
||
5
;
my
$opt_max_save_core
=
env_or_val
(
MTR_MAX_SAVE_CORE
=>
5
)
;
my
$opt_max_save_datadir
=
$ENV
{
MTR_MAX_SAVE_DATADIR
}
||
20
;
my
$opt_max_save_datadir
=
env_or_val
(
MTR_MAX_SAVE_DATADIR
=>
20
)
;
my
$opt_max_test_fail
=
$ENV
{
MTR_MAX_TEST_FAIL
}
||
10
;
my
$opt_max_test_fail
=
env_or_val
(
MTR_MAX_TEST_FAIL
=>
10
)
;
my
$opt_parallel
=
$ENV
{
MTR_PARALLEL
}
||
1
;
my
$opt_parallel
=
$ENV
{
MTR_PARALLEL
}
||
1
;
...
@@ -794,11 +796,12 @@ sub set_vardir {
...
@@ -794,11 +796,12 @@ sub set_vardir {
sub
command_line_setup
{
sub
command_line_setup
{
my
$opt_comment
;
my
$opt_comment
;
my
$opt_usage
;
my
$opt_usage
;
my
$opt_list_options
;
# Read the command line options
# Read the command line options
# Note: Keep list, and the order, in sync with usage at end of this file
# Note: Keep list, and the order, in sync with usage at end of this file
Getopt::Long::
Configure
("
pass_through
");
Getopt::Long::
Configure
("
pass_through
");
GetOptions
(
my
%
options
=
(
# Control what engine/variation to run
# Control what engine/variation to run
'
embedded-server
'
=>
\
$opt_embedded_server
,
'
embedded-server
'
=>
\
$opt_embedded_server
,
'
ps-protocol
'
=>
\
$opt_ps_protocol
,
'
ps-protocol
'
=>
\
$opt_ps_protocol
,
...
@@ -917,9 +920,13 @@ sub command_line_setup {
...
@@ -917,9 +920,13 @@ sub command_line_setup {
'
timediff
'
=>
\&
report_option
,
'
timediff
'
=>
\&
report_option
,
'
help|h
'
=>
\
$opt_usage
,
'
help|h
'
=>
\
$opt_usage
,
)
or
usage
("
Can't read options
");
'
list-options
'
=>
\
$opt_list_options
,
);
GetOptions
(
%
options
)
or
usage
("
Can't read options
");
usage
("")
if
$opt_usage
;
usage
("")
if
$opt_usage
;
list_options
(
\%
options
)
if
$opt_list_options
;
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
# Setup verbosity
# Setup verbosity
...
@@ -5024,7 +5031,7 @@ sub gdb_arguments {
...
@@ -5024,7 +5031,7 @@ sub gdb_arguments {
my
$type
=
shift
;
my
$type
=
shift
;
# Write $args to gdb init file
# Write $args to gdb init file
my
$str
=
join
("
",
@$$args
)
;
my
$str
=
join
"
",
map
{
s/"/\\"/g
;
"
\"
$_
\"
";
}
@$$args
;
my
$gdb_init_file
=
"
$opt_vardir
/tmp/gdbinit.
$type
";
my
$gdb_init_file
=
"
$opt_vardir
/tmp/gdbinit.
$type
";
# Remove the old gdbinit file
# Remove the old gdbinit file
...
@@ -5088,7 +5095,7 @@ sub ddd_arguments {
...
@@ -5088,7 +5095,7 @@ sub ddd_arguments {
my
$type
=
shift
;
my
$type
=
shift
;
# Write $args to ddd init file
# Write $args to ddd init file
my
$str
=
join
("
",
@$$args
)
;
my
$str
=
join
"
",
map
{
s/"/\\"/g
;
"
\"
$_
\"
";
}
@$$args
;
my
$gdb_init_file
=
"
$opt_vardir
/tmp/gdbinit.
$type
";
my
$gdb_init_file
=
"
$opt_vardir
/tmp/gdbinit.
$type
";
# Remove the old gdbinit file
# Remove the old gdbinit file
...
@@ -5483,3 +5490,15 @@ HERE
...
@@ -5483,3 +5490,15 @@ HERE
}
}
sub
list_options
($)
{
my
$hash
=
shift
;
for
(
keys
%
$hash
)
{
s/([:=].*|[+!])$//
;
s/\|/\n--/g
;
print
"
--
$_
\n
"
unless
/list-options/
;
}
exit
(
1
);
}
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