diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-19 13:35:23 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-19 13:35:23 +0100 |
| commit | 2c9650f6545c23b9be26bfad1a64de4aacd5412a (patch) | |
| tree | f45be671951bafcc45782d5ed72d1ae710a1a55b /mysql-test/lib | |
| parent | 6c5183c0d06126c75e7116bef410b032f1dcc42d (diff) | |
| parent | 33c075e842324cfdf0aab055c2db8d0d50bcbc68 (diff) | |
| download | mariadb-git-2c9650f6545c23b9be26bfad1a64de4aacd5412a.tar.gz | |
merge from next-mr
Diffstat (limited to 'mysql-test/lib')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 16bca06971e..c90c4c30e00 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -3916,7 +3916,7 @@ sub mysqld_arguments ($$$$) { if ( $opt_valgrind_mysqld ) { - mtr_add_arg($args, "%s--skip-safemalloc", $prefix); + mtr_add_arg($args, "%s--loose-skip-safemalloc", $prefix); if ( $mysql_version_id < 50100 ) { @@ -5213,7 +5213,6 @@ sub valgrind_arguments { else { mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option - mtr_add_arg($args, "--alignment=8"); mtr_add_arg($args, "--leak-check=yes"); mtr_add_arg($args, "--num-callers=16"); mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir) |