diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 83372e23603..75760fb4019 100644 --- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -4670,7 +4670,7 @@ NdbDictionaryImpl::fix_blob_events(const NdbDictionary::Table* table, const char { const NdbTableImpl& t = table->m_impl; const NdbEventImpl* ev = getEvent(ev_name); - assert(ev != NULL && ev->m_tableImpl == &t); + assert(ev != NULL); Uint32 i; for (i = 0; i < t.m_columns.size(); i++) { assert(t.m_columns[i] != NULL); diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp index a7247d2d040..6b20625bcdc 100644 --- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp +++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp @@ -267,6 +267,7 @@ class NdbEventImpl : public NdbDictionary::Event, public NdbDictObjectImpl { friend class NdbEventOperationImpl; friend class NdbEventBuffer; friend class EventBufData_hash; + friend class NdbBlob; public: NdbEventImpl(); NdbEventImpl(NdbDictionary::Event &); diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp index d4de7a3b5e5..191d36b2e8d 100644 --- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp @@ -335,7 +335,6 @@ NdbEventOperationImpl::getBlobHandle(const NdbColumnImpl *tAttrInfo, int n) NdbEventOperationImpl* tLastBlopOp = NULL; while (tBlobOp != NULL) { if (strcmp(tBlobOp->m_eventImpl->m_name.c_str(), bename) == 0) { - assert(tBlobOp->m_eventImpl->m_tableImpl == tAttrInfo->m_blobTable); break; } tLastBlopOp = tBlobOp;