Merge a changeset from mysql-5.1-innodb:

  ------------------------------------------------------------
  revno: 3477
  revision-id: vasil.dimov@oracle.com-20100520132735-a120y85kqmhp7hxi
  parent: vasil.dimov@oracle.com-20100520125403-3u9ydcfu8vz8spls
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Thu 2010-05-20 16:27:35 +0300
  message:
    Disable main.ps_3innodb for valgrind tests since it results in known
    failures, that are described in
    
    Bug#38999 valgrind warnings for update statement in function compare_record()
    
    At the time I am adding this the failures are:
    
    main.ps_3innodb                          [ fail ]  Found warnings/errors in server log file!
            Test ended at 2010-05-20 01:17:34
    line
    ==31559== Thread 11:
    ==31559== Conditional jump or move depends on uninitialised value(s)
    ==31559==    at 0x75C5BD: compare_record(st_table*) (sql_update.cc:35)
    ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
    ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
    ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
    ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
    ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
    ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
    ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
    ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
    ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
    ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
    ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
    ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
    ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
    ==31559== Conditional jump or move depends on uninitialised value(s)
    ==31559==    at 0x75C5D0: compare_record(st_table*) (sql_update.cc:35)
    ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
    ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
    ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
    ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
    ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
    ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
    ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
    ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
    ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
    ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
    ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
    ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
    ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
    ^ Found warnings in /export/home4/pb2/test/sb_3-1827397-1274300957.87/mysql-5.1.48-linux-x86_64-test/mysql-test/var-n_mix/log/mysqld.1.err

mysql-test/t/ps_3innodb.test

@@ -8,6 +8,10 @@
 # NOTE: PLEASE SEE ps_1general.test (bottom) 
 #       BEFORE ADDING NEW TEST CASES HERE !!!
 
+# See Bug#38999 valgrind warnings for update statement in function
+# compare_record()
+-- source include/not_valgrind.inc
+
 use test;
 
 -- source include/have_innodb.inc