Follup fix for WL#4738

Tor Didriksen · Tor Didriksen · commit 42c5cff70646 · 2010-01-06T16:21:43.000+01:00
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
@@ -3911,7 +3911,7 @@ ($$$$)
 
   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)

Original file line number	Diff line number	Diff line change
`@@ -3911,7 +3911,7 @@ ($$$$)`
`3911`	`3911`
`3912`	`3912`	`if ( $opt_valgrind_mysqld )`
`3913`	`3913`	`{`
`3914`		`- mtr_add_arg($args, "%s--skip-safemalloc", $prefix);`
	`3914`	`+ mtr_add_arg($args, "%s--loose-skip-safemalloc", $prefix);`
`3915`	`3915`
`3916`	`3916`	`if ( $mysql_version_id < 50100 )`
`3917`	`3917`	`{`
`@@ -5208,7 +5208,6 @@ sub valgrind_arguments {`
`5208`	`5208`	`else`
`5209`	`5209`	`{`
`5210`	`5210`	`mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option`
`5211`		`- mtr_add_arg($args, "--alignment=8");`
`5212`	`5211`	`mtr_add_arg($args, "--leak-check=yes");`
`5213`	`5212`	`mtr_add_arg($args, "--num-callers=16");`
`5214`	`5213`	`mtr_add_arg($args, "--suppressions=%s/valgrind.supp", $glob_mysql_test_dir)`