diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 17:10:36 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 17:10:36 +0300 |
| commit | f949e1b80fbbba48fc717ea75a1f9ef41590eeb1 (patch) | |
| tree | 35d57972d218fde29acc34b05b90339ebaa0d3cb /mysql-test/lib | |
| parent | b92ab41c5c380448422bd776c73fddfd5c7507f6 (diff) | |
| parent | 357496c091991d5f22f2b06429757415841fb76b (diff) | |
| download | mariadb-git-f949e1b80fbbba48fc717ea75a1f9ef41590eeb1.tar.gz | |
Merge next-mr -> next-4284.
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 9ae3208fc24..4202334a244 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -3911,7 +3911,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 ) { @@ -5208,7 +5208,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) |