mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
into mysql.com:/usr/local/mysql/mysql-5.0-tmp
This commit is contained in:
@@ -2942,11 +2942,6 @@ sub run_mysqltest ($) {
|
||||
|
||||
mtr_init_args(\$args);
|
||||
|
||||
if ( $opt_valgrind_mysqltest )
|
||||
{
|
||||
valgrind_arguments($args, \$exe);
|
||||
}
|
||||
|
||||
mtr_add_arg($args, "--no-defaults");
|
||||
mtr_add_arg($args, "--silent");
|
||||
mtr_add_arg($args, "-v");
|
||||
@@ -3062,6 +3057,17 @@ sub run_mysqltest ($) {
|
||||
# Add arguments that should not go into the MYSQL_TEST env var
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
if ( $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, "--test-file");
|
||||
mtr_add_arg($args, $tinfo->{'path'});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user