diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-01-26 15:49:09 +0300 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-01-26 15:49:09 +0300 |
| commit | 4eb7054598196f474bfef50318a483c20bc29b87 (patch) | |
| tree | 6905f17334ff8d41735d152b6518a65dd851877b | |
| parent | c895aba35cca2925090adc74ff8de7e71cb0cb3c (diff) | |
| download | mariadb-git-4eb7054598196f474bfef50318a483c20bc29b87.tar.gz | |
Bug #47811 : remove the non-default alignment specification.
Fix backported from to 5.0.
"Remove the alignment option, let valgrind use its default"
| -rw-r--r-- | mysql-test/mysql-test-run-shell.sh | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run-shell.sh b/mysql-test/mysql-test-run-shell.sh index d919246f2e1..d4d31506f23 100644 --- a/mysql-test/mysql-test-run-shell.sh +++ b/mysql-test/mysql-test-run-shell.sh @@ -150,7 +150,7 @@ find_valgrind() fi # >=2.1.2 requires the --tool option, some versions write to stdout, some to stderr valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && FIND_VALGRIND="$FIND_VALGRIND --tool=memcheck" - FIND_VALGRIND="$FIND_VALGRIND --alignment=8 --leak-check=yes --num-callers=16 --suppressions=$MYSQL_TEST_DIR/valgrind.supp" + FIND_VALGRIND="$FIND_VALGRIND --leak-check=yes --num-callers=16 --suppressions=$MYSQL_TEST_DIR/valgrind.supp" } # No paths below as we can't be sure where the program is! diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2cfd689b0e7..f0100593516 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5135,7 +5135,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) |