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
32940fc3
Commit
32940fc3
authored
Apr 09, 2006
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
into mysql.com:/usr/local/mysql/mysql-4.1
parents
a81ea4a8
4d5ab7a9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+11
-5
No files found.
mysql-test/mysql-test-run.pl
View file @
32940fc3
...
@@ -2316,11 +2316,6 @@ sub run_mysqltest ($) {
...
@@ -2316,11 +2316,6 @@ sub run_mysqltest ($) {
mtr_init_args
(
\
$args
);
mtr_init_args
(
\
$args
);
if
(
defined
$opt_valgrind_mysqltest
)
{
valgrind_arguments
(
$args
,
\
$exe
);
}
mtr_add_arg
(
$args
,
"
--no-defaults
");
mtr_add_arg
(
$args
,
"
--no-defaults
");
mtr_add_arg
(
$args
,
"
--socket=%s
",
$master
->
[
0
]
->
{'
path_mysock
'});
mtr_add_arg
(
$args
,
"
--socket=%s
",
$master
->
[
0
]
->
{'
path_mysock
'});
mtr_add_arg
(
$args
,
"
--database=test
");
mtr_add_arg
(
$args
,
"
--database=test
");
...
@@ -2398,6 +2393,17 @@ sub run_mysqltest ($) {
...
@@ -2398,6 +2393,17 @@ sub run_mysqltest ($) {
# Add arguments that should not go into the MYSQL_TEST env var
# Add arguments that should not go into the MYSQL_TEST env var
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
if
(
defined
$opt_valgrind_mysqltest
)
{
# Prefix the Valgrind options to the argument list.
# We do this here, since we do not want to Valgrind the nested invocations
# of mysqltest; that would mess up the stderr output causing test failure.
my
@args_saved
=
@$args
;
mtr_init_args
(
\
$args
);
valgrind_arguments
(
$args
,
\
$exe
);
mtr_add_arg
(
$args
,
"
%s
",
$_
)
for
@args_saved
;
}
mtr_add_arg
(
$args
,
"
-R
");
mtr_add_arg
(
$args
,
"
-R
");
mtr_add_arg
(
$args
,
$tinfo
->
{'
result_file
'});
mtr_add_arg
(
$args
,
$tinfo
->
{'
result_file
'});
...
...
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