bk commit into 5.1 tree (jonas:1.2183)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2008-01-08 16:16:49+01:00, jonas@stripped +1 -0
  ndb - drop6p13c 
    upgrade fix
    allow pre-sumav2 nodes to subscribe using non-master

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2008-01-08 16:16:48+01:00, jonas@stripped +18 -7
    upgrade fix
    allow pre-sumav2 nodes to subscribe using non-master

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop6

--- 1.66/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-01-08 16:16:51 +01:00
+++ 1.67/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2008-01-08 16:16:51 +01:00
@@ -8897,9 +8897,14 @@
     if (c_masterNodeId != getOwnNodeId())
     {
       jam();
-      c_opSubEvent.release(subbPtr);
-      errCode = SubStartRef::NotMaster;
-      goto busy;
+      Uint32 version = getNodeInfo(refToNode(origSenderRef)).m_version;
+      if (likely(version >= NDBD_SUMA_DICT_LOCK))
+      {
+        jam();
+        c_opSubEvent.release(subbPtr);
+        errCode = SubStartRef::NotMaster;
+        goto busy;
+      }
     }
 
     if (!c_sub_startstop_lock.isclear())
@@ -9148,11 +9153,17 @@
     if (c_masterNodeId != getOwnNodeId())
     {
       jam();
-      c_opSubEvent.release(subbPtr);
-      errCode = SubStopRef::NotMaster;
-      goto busy;
-    }
 
+      Uint32 version = getNodeInfo(refToNode(origSenderRef)).m_version;
+      if (likely(version >= NDBD_SUMA_DICT_LOCK))
+      {
+        jam();
+        c_opSubEvent.release(subbPtr);
+        errCode = SubStopRef::NotMaster;
+        goto busy;
+      }
+    }
+    
     if (!c_sub_startstop_lock.isclear())
     {
       jam();