bk commit into 5.0 tree (serg:1.2427)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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, 2007-04-02 09:21:19+02:00, serg@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
  into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
  MERGE: 1.2410.1.16

  heap/hp_write.c@stripped, 2007-04-02 09:21:15+02:00, serg@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-04-02 09:21:15+02:00, serg@stripped +0 -0
    Auto merged
    MERGE: 1.299.3.2

# 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:	serg
# Host:	janus.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0/RESYNC

--- 1.304/sql/ha_ndbcluster.cc	2007-04-02 09:21:24 +02:00
+++ 1.305/sql/ha_ndbcluster.cc	2007-04-02 09:21:24 +02:00
@@ -753,7 +753,7 @@
         blob_ptr= (char*)"";
       }
 
-      DBUG_PRINT("value", ("set blob ptr=%p len=%u",
+      DBUG_PRINT("value", ("set blob ptr: %p  len: %u",
                            blob_ptr, blob_len));
       DBUG_DUMP("value", (char*)blob_ptr, min(blob_len, 26));
 
@@ -4410,7 +4410,7 @@
   for (i= 0; i < form->s->fields; i++) 
   {
     Field *field= form->field[i];
-    DBUG_PRINT("info", ("name: %s, type: %u, pack_length: %d", 
+    DBUG_PRINT("info", ("name: %s  type: %u  pack_length: %d", 
                         field->field_name, field->real_type(),
                         field->pack_length()));
     if ((my_errno= create_ndb_column(col, field, create_info)))
@@ -5991,7 +5991,7 @@
   uint blob_len;
   frm_blob_struct* blob;
   DBUG_ENTER("packfrm");
-  DBUG_PRINT("enter", ("data: 0x%lx, len: %d", (long) data, len));
+  DBUG_PRINT("enter", ("data: 0x%lx  len: %d", (long) data, len));
   
   error= 1;
   org_len= len;
@@ -6018,7 +6018,8 @@
   *pack_len= blob_len;
   error= 0;
   
-  DBUG_PRINT("exit", ("pack_data: 0x%lx, pack_len: %d", (long) *pack_data, *pack_len));
+  DBUG_PRINT("exit", ("pack_data: 0x%lx  pack_len: %d", (long) *pack_data,
+                      *pack_len));
 err:
   DBUG_RETURN(error);
   
@@ -6057,7 +6058,8 @@
    *unpack_data= data;
    *unpack_len= complen;
 
-   DBUG_PRINT("exit", ("frmdata: 0x%lx, len: %d", (long) *unpack_data, *unpack_len));
+   DBUG_PRINT("exit", ("frmdata: 0x%lx  len: %d", (long) *unpack_data,
+                       *unpack_len));
 
    DBUG_RETURN(0);
 }