bk commit into 5.1 tree (mats:1.2373) BUG#24488

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-23 16:21:53+01:00, mats@romeo.(none) +1 -0
  BUG#24488 (Valgrind warnings on invalid read in mysql_client_binlog_statement):
  Disabling debug printouts for valgrind builds that print unallocated memory.

  sql/sql_binlog.cc@stripped, 2006-11-23 16:21:48+01:00, mats@romeo.(none) +12 -0
    Disabling debug printouts for valgrind builds that print unallocated memory 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/memcheck-mysql-5.1

--- 1.3/sql/sql_binlog.cc	2006-11-23 16:22:01 +01:00
+++ 1.4/sql/sql_binlog.cc	2006-11-23 16:22:01 +01:00
@@ -79,9 +79,15 @@
     char const *endptr= 0;
     int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr);
 
+#ifndef HAVE_purify
+      /*
+        This debug printout should not be used for valgrind builds
+        since it will read from unassigned memory.
+      */
     DBUG_PRINT("info",
                ("bytes_decoded=%d; strptr=0x%lu; endptr=0x%lu ('%c':%d)",
                 bytes_decoded, strptr, endptr, *endptr, *endptr));
+#endif
 
     if (bytes_decoded < 0)
     {
@@ -147,8 +153,14 @@
       DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code()));
       DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=0x%lx",
                          bufptr+EVENT_TYPE_OFFSET));
+#ifndef HAVE_purify
+      /*
+        This debug printout should not be used for valgrind builds
+        since it will read from unassigned memory.
+      */
       DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=0x%lx; buf[EVENT_LEN_OFFSET]=%u",
                           bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET)));
+#endif
       ev->thd= thd;
       if (int err= ev->exec_event(thd->rli_fake))
       {