List:Commits« Previous MessageNext Message »
From:tomas Date:June 13 2006 11:19pm
Subject:bk commit into 5.1 tree (tomas:1.2188)
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.2188 06/06/14 01:19:13 tomas@stripped +1 -0
  correct initialization of event operation to enable early delete

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.61 06/06/14 01:19:06 tomas@stripped +12 -4
    correct initialization of event operation to enable early delete

# 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-new-ndb

--- 1.60/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-06-12 17:57:27 +02:00
+++ 1.61/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-06-14 01:19:06 +02:00
@@ -79,7 +79,8 @@
   NdbEventOperation(*this),
   m_facade(&f),
   m_ndb(theNdb),
-  m_state(EO_ERROR)
+  m_state(EO_ERROR),
+  m_oid(~(Uint32)0)
 {
   DBUG_ENTER("NdbEventOperationImpl::NdbEventOperationImpl");
 
@@ -88,7 +89,11 @@
   assert(myDict != NULL);
 
   const NdbDictionary::Event *myEvnt = myDict->getEvent(eventName);
-  if (!myEvnt) { m_error.code= myDict->getNdbError().code; DBUG_VOID_RETURN; }
+  if (!myEvnt)
+  {
+    m_error.code= myDict->getNdbError().code;
+    DBUG_VOID_RETURN;
+  }
 
   init(myEvnt->m_impl);
   DBUG_VOID_RETURN;
@@ -99,7 +104,8 @@
   NdbEventOperation(*this),
   m_facade(this),
   m_ndb(theNdb),
-  m_state(EO_ERROR)
+  m_state(EO_ERROR),
+  m_oid(~(Uint32)0)
 {
   DBUG_ENTER("NdbEventOperationImpl::NdbEventOperationImpl [evnt]");
   init(evnt);
@@ -113,7 +119,6 @@
 
   m_magic_number = 0;
   mi_type = 0;
-  m_oid = ~(Uint32)0;
   m_change_mask = 0;
 #ifdef VM_TRACE
   m_data_done_count = 0;
@@ -172,6 +177,9 @@
 {
   DBUG_ENTER("NdbEventOperationImpl::~NdbEventOperationImpl");
   m_magic_number= 0;
+
+  if (m_oid == ~(Uint32)0)
+    DBUG_VOID_RETURN;
 
   stop();
   // m_bufferHandle->dropSubscribeEvent(m_bufferId);
Thread
bk commit into 5.1 tree (tomas:1.2188)tomas14 Jun