Merge romeo.(none):/home/bkroot/mysql-5.1

into  romeo.(none):/home/bk/memcheck-mysql-5.1

sql/sql_class.cc

@@ -2728,10 +2728,16 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
   my_size_t const after_size= pack_row(table, cols, after_row, 
                                        after_record);
 
+  /*
+    Don't print debug messages when running valgrind since they can
+    trigger false warnings.
+   */
+#ifndef HAVE_purify
   DBUG_DUMP("before_record", (const char *)before_record, table->s->reclength);
   DBUG_DUMP("after_record", (const char *)after_record, table->s->reclength);
   DBUG_DUMP("before_row", (const char *)before_row, before_size);
   DBUG_DUMP("after_row", (const char *)after_row, after_size);
+#endif
 
   Rows_log_event* const ev=
     binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,

sql/table.cc

@@ -1377,9 +1377,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
   if (!(record= (byte*) alloc_root(&outparam->mem_root,
                                    share->rec_buff_length * records)))
     goto err;                                   /* purecov: inspected */
-#ifdef HAVE_purify
-     bzero(record, share->rec_buff_length * records);
-#endif  
+
   if (records == 0)
   {
     /* We are probably in hard repair, and the buffers should not be used */