From f52b0e37685206b79f01ab0136e63b3f5925d73c Mon Sep 17 00:00:00 2001
From: "jonas@perch.ndb.mysql.com" <>
Date: Wed, 11 Apr 2007 08:23:16 +0200
Subject: [PATCH 1/3] ndb - bug#27748   fix commit trigger on multi-update

---
 ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index e16d3df6d8d..37bf33f0313 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -390,6 +390,7 @@ Dbtup::commitRecord(Signal* signal,
 
   fragptr.p = regFragPtr;
   tabptr.p = regTabPtr;
+  Uint32 hashValue = firstOpPtr.p->hashValue;
 
   if (opType == ZINSERT_DELETE) {
     ljam();
@@ -412,6 +413,7 @@ Dbtup::commitRecord(Signal* signal,
 //--------------------------------------------------------------------
     Uint32 saveOpType = regOperPtr->optype;
     regOperPtr->optype = ZINSERT;
+    regOperPtr->hashValue = hashValue;
     operPtr.p = regOperPtr;
 
     checkDetachedTriggers(signal,
@@ -444,6 +446,8 @@ Dbtup::commitRecord(Signal* signal,
     befOpPtr.p->changeMask.clear();
     befOpPtr.p->changeMask.bitOR(attributeMask);
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->optype = ZUPDATE;
+    befOpPtr.p->hashValue = hashValue;
     
     befOpPtr.p->optype = opType;
     operPtr.p = befOpPtr.p;
@@ -478,11 +482,13 @@ Dbtup::commitRecord(Signal* signal,
     Uint32 fragPageId = befOpPtr.p->fragPageId;
     Uint32 pageIndex  = befOpPtr.p->pageIndex;
 
+    befOpPtr.p->optype = ZDELETE;
     befOpPtr.p->realPageId = befOpPtr.p->realPageIdC;
     befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
     befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
     befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->hashValue = hashValue;
 
     befOpPtr.p->optype = opType;
     operPtr.p = befOpPtr.p;

From 3c0e6e3983be867bc155ba1eed97e2c7fa3d7cd0 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 11 Apr 2007 19:29:32 +0200
Subject: [PATCH 2/3] missing return

---
 ndb/src/ndbapi/Ndb.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index 3e407c43ca1..449f287dc1d 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -1164,6 +1164,7 @@ int Ndb::setSchemaName(const char * a_schema_name)
       return -1;
     }
   }
+  return 0;
 }
  
 /*

From b86f256d2461e5a2e776618bbfdc84250c8204fc Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Wed, 11 Apr 2007 20:22:31 +0200
Subject: [PATCH 3/3] remove warning

---
 ndb/src/ndbapi/Ndbif.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/src/ndbapi/Ndbif.cpp b/ndb/src/ndbapi/Ndbif.cpp
index bcc0d9d997c..d404436be59 100644
--- a/ndb/src/ndbapi/Ndbif.cpp
+++ b/ndb/src/ndbapi/Ndbif.cpp
@@ -816,7 +816,7 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
  InvalidSignal:
 #ifdef VM_TRACE
   ndbout_c("Ndbif: Error Ndb::handleReceivedSignal "
-	   "(tFirstDataPtr=%x, GSN=%d, theImpl->theWaiter.m_state=%d)"
+	   "(tFirstDataPtr=%p, GSN=%d, theImpl->theWaiter.m_state=%d)"
 	   " sender = (Block: %d Node: %d)",
            tFirstDataPtr,
 	   tSignalNumber,