bk commit into 5.1 tree (hartmut:1.2336) BUG#23529

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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-10-23 01:36:58+02:00, hartmut@stripped +2 -0
  more %p / pointer placeholder fixes (Bug #23529)

  mysys/my_malloc.c@stripped, 2006-10-23 01:36:55+02:00, hartmut@stripped +2 -2
    more %p / pointer placeholder fixes (Bug #23529)

  mysys/my_realloc.c@stripped, 2006-10-23 01:36:55+02:00, hartmut@stripped +2 -2
    more %p / pointer placeholder fixes (Bug #23529)

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1-maint

--- 1.12/mysys/my_malloc.c	2006-10-23 01:37:10 +02:00
+++ 1.13/mysys/my_malloc.c	2006-10-23 01:37:10 +02:00
@@ -44,7 +44,7 @@
   }
   else if (my_flags & MY_ZEROFILL)
     bzero(point,size);
-  DBUG_PRINT("exit",("ptr: 0x%lx",point));
+  DBUG_PRINT("exit",("ptr: %p",point));
   DBUG_RETURN(point);
 } /* my_malloc */
 
@@ -55,7 +55,7 @@
 void my_no_flags_free(gptr ptr)
 {
   DBUG_ENTER("my_free");
-  DBUG_PRINT("my",("ptr: 0x%lx",ptr));
+  DBUG_PRINT("my",("ptr: %p",ptr));
   if (ptr)
     free(ptr);
   DBUG_VOID_RETURN;

--- 1.8/mysys/my_realloc.c	2006-10-23 01:37:10 +02:00
+++ 1.9/mysys/my_realloc.c	2006-10-23 01:37:10 +02:00
@@ -27,7 +27,7 @@
 {
   gptr point;
   DBUG_ENTER("my_realloc");
-  DBUG_PRINT("my",("ptr: 0x%lx  size: %u  my_flags: %d",oldpoint, size,
+  DBUG_PRINT("my",("ptr: %p  size: %u  my_flags: %d",oldpoint, size,
 		   my_flags));
 
   if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR))
@@ -60,6 +60,6 @@
       my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), size);
   }
 #endif
-  DBUG_PRINT("exit",("ptr: 0x%lx",point));
+  DBUG_PRINT("exit",("ptr: %p",point));
   DBUG_RETURN(point);
 } /* my_realloc */