database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0

Browse Source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-10 17:48:17 -07:00
parent 099e770e7d 6978949b49
commit 69e54f84ec
7 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/mysql-test-run.pl
View File

@ -3194,11 +3194,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");
@ -3314,6 +3309,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'});