List:Commits« Previous MessageNext Message »
From:tomas Date:January 12 2006 5:11pm
Subject:bk commit into 5.1 tree (tomas:1.2043)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2043 06/01/12 18:11:12 tomas@stripped +2 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-wl2325-v6

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.29 06/01/12 18:11:04 tomas@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.20 06/01/12 18:11:04 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6/RESYNC

--- 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-12 14:30:28 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-12 18:11:04 +01:00
@@ -358,8 +358,8 @@
 /* ---------------------------------------------------------------- */
 void
 Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec *regOperPtr, 
+                                         Tablerec *regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -376,8 +376,8 @@
 
 void
 Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec* regOperPtr, 
+                                         Tablerec* regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -401,8 +401,8 @@
 
 void
 Dbtup::checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
-                                         Operationrec* const regOperPtr, 
-                                         Tablerec* const regTablePtr)
+                                         Operationrec* regOperPtr, 
+                                         Tablerec* regTablePtr)
 {
   if(refToBlock(req_struct->TC_ref) != DBTC) {
     return;
@@ -446,8 +446,8 @@
 /*                                                                  */
 /* ---------------------------------------------------------------- */
 void Dbtup::checkDetachedTriggers(KeyReqStruct *req_struct,
-                                  Operationrec* const regOperPtr,
-                                  Tablerec* const regTablePtr)
+                                  Operationrec* regOperPtr,
+                                  Tablerec* regTablePtr)
 {
   Uint32 save_type = regOperPtr->op_struct.op_type;
   Tuple_header *save_ptr = req_struct->m_tuple_ptr;  
@@ -1051,9 +1051,9 @@
 
 int
 Dbtup::executeTuxInsertTriggers(Signal* signal,
-                                Operationrec* const regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Operationrec* regOperPtr,
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // fill in constant part
@@ -1068,9 +1068,9 @@
 
 int
 Dbtup::executeTuxUpdateTriggers(Signal* signal,
-                                Operationrec* const regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Operationrec* regOperPtr,
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // fill in constant part
@@ -1141,8 +1141,8 @@
 void
 Dbtup::executeTuxCommitTriggers(Signal* signal,
                                 Operationrec* regOperPtr,
-                                Fragrecord* const regFragPtr,
-                                Tablerec* const regTabPtr)
+                                Fragrecord* regFragPtr,
+                                Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   Uint32 tupVersion;
@@ -1176,8 +1176,8 @@
 void
 Dbtup::executeTuxAbortTriggers(Signal* signal,
                                Operationrec* regOperPtr,
-                               Fragrecord* const regFragPtr,
-                               Tablerec* const regTabPtr)
+                               Fragrecord* regFragPtr,
+                               Tablerec* regTabPtr)
 {
   TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
   // get version

--- 1.28/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-12 16:14:39 +01:00
+++ 1.29/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-12 18:11:04 +01:00
@@ -270,6 +270,7 @@
   m_state= EO_ERROR;
   mi_type= 0;
   m_magic_number= 0;
+  m_error.code= myDict->getNdbError().code;
   m_ndb->theEventBuffer->remove_op();
   m_ndb->theEventBuffer->add_drop_unlock();
   DBUG_RETURN(r);
@@ -672,7 +673,7 @@
 
   NdbMutex_Lock(m_mutex);
   NdbEventOperationImpl *ev_op= move_data();
-  if (unlikely(ev_op == 0))
+  if (unlikely(ev_op == 0 && aMillisecondNumber))
   {
     NdbCondition_WaitTimeout(p_cond, m_mutex, aMillisecondNumber);
     ev_op= move_data();
@@ -1015,6 +1016,33 @@
 }
 
 void
+NdbEventBuffer::report_node_failure(Uint32 node_id)
+{
+  DBUG_ENTER("NdbEventBuffer::report_node_failure");
+  SubTableData data;
+  LinearSectionPtr ptr[3];
+  bzero(&data, sizeof(data));
+  bzero(ptr, sizeof(ptr));
+
+  data.tableId = ~0;
+  data.operation = NdbDictionary::Event::_TE_NODE_FAILURE;
+  data.req_nodeid = (Uint8)node_id;
+  data.ndbd_nodeid = (Uint8)node_id;
+  data.logType = SubTableData::LOG;
+  /**
+   * Insert this event for each operation
+   */
+  NdbEventOperation* op= 0;
+  while((op = m_ndb->getEventOperation(op)))
+  {
+    NdbEventOperationImpl* impl= &op->m_impl;
+    data.senderData = impl->m_oid;
+    insertDataL(impl, &data, ptr); 
+  }
+  DBUG_VOID_RETURN;
+}
+
+void
 NdbEventBuffer::completeClusterFailed()
 {
   DBUG_ENTER("NdbEventBuffer::completeClusterFailed");
@@ -1648,7 +1676,7 @@
     m_min_free_thresh= m_free_thresh;
     m_max_free_thresh= 100;
     goto send_report;
- }
+  }
   if (latest_gci-apply_gci >=  m_gci_slip_thresh)
   {
     goto send_report;
Thread
bk commit into 5.1 tree (tomas:1.2043)tomas12 Jan