bzr push into mysql-5.0 branch (ramil:2897 to 2898) Bug#47811

[Ramil Kalimullin]

 2898 Ramil Kalimullin	2011-01-26
      Bug #47811 : remove the non-default alignment specification.
      
      Fix backported from to 5.0.
      "Remove the alignment option, let valgrind use its default"
     @ mysql-test/mysql-test-run-shell.sh
        Bug #47811 : remove the non-default alignment specification.
          - backport from 5.1
           "Remove the alignment option, let valgrind use its default"
     @ mysql-test/mysql-test-run.pl
        Bug #47811 : remove the non-default alignment specification.
          - backport from 5.1
           "Remove the alignment option, let valgrind use its default"

    modified:
      mysql-test/mysql-test-run-shell.sh
      mysql-test/mysql-test-run.pl
 2897 Libing Song	2011-01-26
      Postfix bug#49124
      Updated the copyright.

    modified:
      sql/mysql_priv.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
=== modified file 'mysql-test/mysql-test-run-shell.sh'
--- a/mysql-test/mysql-test-run-shell.sh	2010-12-28 18:57:23 +0000
+++ b/mysql-test/mysql-test-run-shell.sh	2011-01-26 12:49:09 +0000
@@ -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!

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-12-28 18:57:23 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-01-26 12:49:09 +0000
@@ -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)

No bundle (reason: useless for push emails).