Bug#33855045 Test ndbinfo_upgrade fails on valgrind builds [#3]

Remove duplicated NdbEventOperationImpl::m_eventId which is only used in some printouts. Change-Id: Id494e17e3a483a8d049e9aaeb9f41bd6d4ccd847
percona-ysorokin · Mar 22, 2022 · bbafd3c · bbafd3c
1 parent 467bffa
commit bbafd3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -137,7 +137,6 @@ NdbEventOperationImpl::init(NdbEventImpl& evnt)
   m_next = 0;
   m_prev = 0;
 
-  m_eventId = 0;
   theFirstPkAttrs[0] = NULL;
   theCurrentPkAttrs[0] = NULL;
   theFirstPkAttrs[1] = NULL;
@@ -163,8 +162,6 @@ NdbEventOperationImpl::init(NdbEventImpl& evnt)
 
   m_eventImpl = &evnt;
 
-  m_eventId = m_eventImpl->m_eventId;
-
   m_oid= m_ndb->theImpl->mapRecipient(this);
 
   m_state= EO_CREATED;
@@ -1188,7 +1185,7 @@ void
 NdbEventOperationImpl::print()
 {
   int i;
-  ndbout << "EventId " << m_eventId << "\n";
+  ndbout << "EventId " << m_eventImpl->m_eventId << "\n";
 
   for (i = 0; i < 2; i++) {
     NdbRecAttr *p = theFirstPkAttrs[i];
@@ -3282,7 +3279,7 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op,
     Gci_container* bucket= find_bucket(gci);
 
     DBUG_PRINT_EVENT("info", ("data insertion in eventId %d 0x%x %s",
-                              op->m_eventId, m_ndb->getReference(),
+                              op->m_eventImpl->m_eventId, m_ndb->getReference(),
                               m_ndb->getNdbObjectName()));
     DBUG_PRINT_EVENT("info", ("gci=%d tab=%d op=%d node=%d",
                               sdata->gci, sdata->tableId, 
@@ -3405,7 +3402,7 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op,
   if ((Uint32)op->m_eventImpl->mi_type & (1U << operation))
   {
     DBUG_PRINT_EVENT("info",("Data arrived before ready eventId %d 0x%x %s",
-                             op->m_eventId, m_ndb->getReference(),
+                             op->m_eventImpl->m_eventId, m_ndb->getReference(),
                              m_ndb->getNdbObjectName()));
     DBUG_RETURN_EVENT(0);
   }

diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
@@ -618,7 +618,6 @@ class NdbEventOperationImpl : public NdbEventOperation {
   Uint32 mi_type; /* should be == 0 if m_state != EO_EXECUTING
 		   * else same as in EventImpl
 		   */
-  Uint32 m_eventId;
   Uint32 m_oid;
 
   /*