bk commit into 5.1 tree (jonas:1.2434) BUG#27005

[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, 2007-03-14 15:37:47+01:00, jonas@stripped +2 -0
  ndb - bug#27005
      Handle API failure during resend
      API failure could cause release of table object, which will make resend crash
        when dereferencing table object
        
      Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
  

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2007-03-14 15:37:45+01:00,
jonas@stripped +49 -29
    Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
          
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend

  storage/ndb/test/tools/listen.cpp@stripped, 2007-03-14 15:37:45+01:00,
jonas@stripped +7 -1
    add new events

# 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/51-telco-gca

--- 1.54/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-03-14 15:37:52 +01:00
+++ 1.55/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-03-14 15:37:52 +01:00
@@ -756,6 +756,17 @@
     Restart.resetRestart(signal);
   }
 
+  if (ERROR_INSERTED(13032))
+  {
+    Uint32 node = c_subscriber_nodes.find(0);
+    if (node != NodeBitmask::NotFound)
+    {
+      ndbout_c("Inserting API_FAILREQ node: %u", node);
+      signal->theData[0] = node;
+      EXECUTE_DIRECT(QMGR, GSN_API_FAILREQ, signal, 1);
+    }
+  }
+  
   signal->theData[0] = SumaContinueB::RESEND_BUCKET;
 
   NdbNodeBitmask tmp;
@@ -3460,7 +3471,10 @@
    */
   f_bufferLock = 0;
   b_bufferLock = 0;
-
+  
+  ndbrequire((tabPtr.p = c_tablePool.getPtr(tabPtr.i)) != 0);
+  Uint32 tableId = tabPtr.p->m_tableId;
+  
   Uint32 bucket= hashValue % c_no_of_buckets;
   m_max_seen_gci = (gci > m_max_seen_gci ? gci : m_max_seen_gci);
   if(m_active_buckets.get(bucket) || 
@@ -3483,7 +3497,7 @@
     
     SubTableData * data = (SubTableData*)signal->getDataPtrSend();//trg;
     data->gci            = gci;
-    data->tableId        = tabPtr.p->m_tableId;
+    data->tableId        = tableId;
     data->requestInfo    = 0;
     SubTableData::setOperation(data->requestInfo, event);
     data->logType        = 0;
@@ -3506,10 +3520,11 @@
   else 
   {
     Uint32* dst;
-    Uint32 sz = f_trigBufferSize + b_trigBufferSize + 2;
+    Uint32 sz = f_trigBufferSize + b_trigBufferSize + 3;
     if((dst = get_buffer_ptr(signal, bucket, gci, sz)))
     {
-      * dst++ = tabPtr.i;
+      * dst++ = tableId;
+      * dst++ = tabPtr.p->m_schemaVersion;
       * dst++ = (event << 16) | f_trigBufferSize;
       memcpy(dst, f_buffer, f_trigBufferSize << 2);
       dst += f_trigBufferSize;
@@ -3641,7 +3656,7 @@
     
     if(c_buckets[i].m_buffer_tail != RNIL)
     {
-      Uint32* dst;
+      //Uint32* dst;
       get_buffer_ptr(signal, i, gci, 0);
     }
   }
@@ -3986,8 +4001,8 @@
 Suma::completeSubRemove(SubscriptionPtr subPtr)
 {
   DBUG_ENTER("Suma::completeSubRemove");
-  Uint32 subscriptionId  = subPtr.p->m_subscriptionId;
-  Uint32 subscriptionKey = subPtr.p->m_subscriptionKey;
+  //Uint32 subscriptionId  = subPtr.p->m_subscriptionId;
+  //Uint32 subscriptionKey = subPtr.p->m_subscriptionKey;
 
   c_subscriptions.release(subPtr);
   DBUG_PRINT("info",("c_subscriptionPool  size: %d free: %d",
@@ -5003,43 +5018,48 @@
     {
       g_cnt++;
       Uint32 table = * src++ ;
+      Uint32 schemaVersion = * src++;
       Uint32 event = * src >> 16;
       Uint32 sz_1 = (* src ++) & 0xFFFF;
-
-      ndbassert(sz - 2 >= sz_1);
+      
+      ndbassert(sz - 3 >= sz_1);
       
       LinearSectionPtr ptr[3];
       const Uint32 nptr= reformat(signal, ptr, 
 				  src, sz_1, 
-				  src + sz_1, sz - 2 - sz_1);
+				  src + sz_1, sz - 3 - sz_1);
       Uint32 ptrLen= 0;
       for(Uint32 i =0; i < nptr; i++)
         ptrLen+= ptr[i].sz;
+
       /**
        * Signal to subscriber(s)
        */
       Ptr<Table> tabPtr;
-      ndbrequire((tabPtr.p = c_tablePool.getPtr(table)) != 0);
-      
-      SubTableData * data = (SubTableData*)signal->getDataPtrSend();//trg;
-      data->gci            = last_gci;
-      data->tableId        = tabPtr.p->m_tableId;
-      data->requestInfo    = 0;
-      SubTableData::setOperation(data->requestInfo, event);
-      data->logType        = 0;
-      data->changeMask     = 0;
-      data->totalLen       = ptrLen;
-      
+      if (c_tables.find(tabPtr, table) && 
+	  tabPtr.p->m_schemaVersion == schemaVersion)
       {
-	LocalDLList<Subscriber> list(c_subscriberPool,tabPtr.p->c_subscribers);
-	SubscriberPtr subbPtr;
-	for(list.first(subbPtr); !subbPtr.isNull(); list.next(subbPtr))
+	SubTableData * data = (SubTableData*)signal->getDataPtrSend();//trg;
+	data->gci            = last_gci;
+	data->tableId        = table;
+	data->requestInfo    = 0;
+	SubTableData::setOperation(data->requestInfo, event);
+	data->logType        = 0;
+	data->changeMask     = 0;
+	data->totalLen       = ptrLen;
+	
 	{
-	  DBUG_PRINT("info",("GSN_SUB_TABLE_DATA to node %d",
-			     refToNode(subbPtr.p->m_senderRef)));
-	  data->senderData = subbPtr.p->m_senderData;
-	  sendSignal(subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal,
-		     SubTableData::SignalLength, JBB, ptr, nptr);
+	  LocalDLList<Subscriber> 
+	    list(c_subscriberPool,tabPtr.p->c_subscribers);
+	  SubscriberPtr subbPtr;
+	  for(list.first(subbPtr); !subbPtr.isNull(); list.next(subbPtr))
+	  {
+	    DBUG_PRINT("info",("GSN_SUB_TABLE_DATA to node %d",
+			       refToNode(subbPtr.p->m_senderRef)));
+	    data->senderData = subbPtr.p->m_senderData;
+	    sendSignal(subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal,
+		       SubTableData::SignalLength, JBB, ptr, nptr);
+	  }
 	}
       }
     }

--- 1.4/storage/ndb/test/tools/listen.cpp	2007-03-14 15:37:52 +01:00
+++ 1.5/storage/ndb/test/tools/listen.cpp	2007-03-14 15:37:52 +01:00
@@ -168,9 +168,15 @@
 	  break;
 	case NdbDictionary::Event::TE_DROP:
 	  break;
+	case NdbDictionary::Event::TE_NODE_FAILURE:
+	  break;
+	case NdbDictionary::Event::TE_SUBSCRIBE:
+	case NdbDictionary::Event::TE_UNSUBSCRIBE:
+	  break;
 	default:
 	  /* We should REALLY never get here. */
-	  ndbout_c("Error: unknown event type");
+	  ndbout_c("Error: unknown event type: %u", 
+		   (Uint32)pOp->getEventType());
 	  abort();
 	}
       } while ((pOp= MyNdb.nextEvent()) && gci == pOp->getGCI());