Skip to content

Commit bbafd3c

Browse files
committed
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
1 parent 467bffa commit bbafd3c

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ NdbEventOperationImpl::init(NdbEventImpl& evnt)
137137
m_next = 0;
138138
m_prev = 0;
139139

140-
m_eventId = 0;
141140
theFirstPkAttrs[0] = NULL;
142141
theCurrentPkAttrs[0] = NULL;
143142
theFirstPkAttrs[1] = NULL;
@@ -163,8 +162,6 @@ NdbEventOperationImpl::init(NdbEventImpl& evnt)
163162

164163
m_eventImpl = &evnt;
165164

166-
m_eventId = m_eventImpl->m_eventId;
167-
168165
m_oid= m_ndb->theImpl->mapRecipient(this);
169166

170167
m_state= EO_CREATED;
@@ -1188,7 +1185,7 @@ void
11881185
NdbEventOperationImpl::print()
11891186
{
11901187
int i;
1191-
ndbout << "EventId " << m_eventId << "\n";
1188+
ndbout << "EventId " << m_eventImpl->m_eventId << "\n";
11921189

11931190
for (i = 0; i < 2; i++) {
11941191
NdbRecAttr *p = theFirstPkAttrs[i];
@@ -3282,7 +3279,7 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op,
32823279
Gci_container* bucket= find_bucket(gci);
32833280

32843281
DBUG_PRINT_EVENT("info", ("data insertion in eventId %d 0x%x %s",
3285-
op->m_eventId, m_ndb->getReference(),
3282+
op->m_eventImpl->m_eventId, m_ndb->getReference(),
32863283
m_ndb->getNdbObjectName()));
32873284
DBUG_PRINT_EVENT("info", ("gci=%d tab=%d op=%d node=%d",
32883285
sdata->gci, sdata->tableId,
@@ -3405,7 +3402,7 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op,
34053402
if ((Uint32)op->m_eventImpl->mi_type & (1U << operation))
34063403
{
34073404
DBUG_PRINT_EVENT("info",("Data arrived before ready eventId %d 0x%x %s",
3408-
op->m_eventId, m_ndb->getReference(),
3405+
op->m_eventImpl->m_eventId, m_ndb->getReference(),
34093406
m_ndb->getNdbObjectName()));
34103407
DBUG_RETURN_EVENT(0);
34113408
}

storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,6 @@ class NdbEventOperationImpl : public NdbEventOperation {
618618
Uint32 mi_type; /* should be == 0 if m_state != EO_EXECUTING
619619
* else same as in EventImpl
620620
*/
621-
Uint32 m_eventId;
622621
Uint32 m_oid;
623622

624623
/*

0 commit comments

Comments
 (0)