From: Date: December 12 2008 3:05pm
Subject: bzr commit into mysql-5.1 branch (jonas:2794) Bug#41435
List-Archive: http://lists.mysql.com/commits/61495
X-Bug: 41435
Message-Id: <20081212140548.30DBF7D087@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/jonas/src/telco-6.3/

 2794 Jonas Oreland	2008-12-12
      ndb - bug#41435 - upgrade 6.2 to 6.3
modified:
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-12-08 13:39:11 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-12-12 14:05:37 +0000
@@ -16475,10 +16475,16 @@ Dbdih::sendDictUnlockOrd(Signal* signal,
       return;
     }
   }
-  
+
+  Uint32 len = DictUnlockOrd::SignalLength;
+  if (unlikely(getNodeInfo(cmasterNodeId).m_version < NDB_MAKE_VERSION(6,3,0)))
+  {
+    jam();
+    len = 2;
+  }
+
   BlockReference dictMasterRef = calcDictBlockRef(cmasterNodeId);
-  sendSignal(dictMasterRef, GSN_DICT_UNLOCK_ORD, signal,
-             DictUnlockOrd::SignalLength, JBB);
+  sendSignal(dictMasterRef, GSN_DICT_UNLOCK_ORD, signal, len, JBB);
 }
 
 #ifdef ERROR_INSERT