bk commit into 5.0 tree (mskold:1.2324)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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-12-04 15:09:47+01:00, mskold@stripped +2 -0
  Merge mskold@stripped:/home/bk/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
  MERGE: 1.2314.1.5

  ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-12-04 15:09:38+01:00, mskold@stripped +0
-0
    Auto merged
    MERGE: 1.53.1.1

  sql/ha_ndbcluster.cc@stripped, 2006-12-04 15:09:38+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.286.1.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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0-ndb/RESYNC

--- 1.54/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 15:09:55 +01:00
+++ 1.55/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 15:09:55 +01:00
@@ -923,7 +923,10 @@ NdbTransaction::release(){
      *	The user did not perform any rollback but simply closed the
      *      transaction. We must rollback Ndb since Ndb have been contacted.
      ************************************************************************/
-    execute(Rollback);
+    if (!theSimpleState)
+    {
+      execute(Rollback);
+    }
   }//if
   theMagicNumber = 0xFE11DC;
   theInUseState = false;

--- 1.290/sql/ha_ndbcluster.cc	2006-12-04 15:09:55 +01:00
+++ 1.291/sql/ha_ndbcluster.cc	2006-12-04 15:09:56 +01:00
@@ -822,8 +822,8 @@ int ha_ndbcluster::get_ndb_blobs_value(N
         {
           char *buf= m_blobs_buffer + offset;
           uint32 len= 0xffffffff;  // Max uint32
-          DBUG_PRINT("value", ("read blob ptr=%x len=%u",
-                               (UintPtr)buf, (uint)blob_len));
+          DBUG_PRINT("value", ("read blob ptr: 0x%lx  len: %u",
+                               (long)buf, (uint)blob_len));
           if (ndb_blob->readData(buf, len) != 0)
             DBUG_RETURN(-1);
           DBUG_ASSERT(len == blob_len);