Commit 1df5f9b3 authored by mskold@mysql.com's avatar mskold@mysql.com

Fixes to BLOB replication code for changes to event(now stores own copy of table)

parent 8e024290
...@@ -4670,7 +4670,7 @@ NdbDictionaryImpl::fix_blob_events(const NdbDictionary::Table* table, const char ...@@ -4670,7 +4670,7 @@ NdbDictionaryImpl::fix_blob_events(const NdbDictionary::Table* table, const char
{ {
const NdbTableImpl& t = table->m_impl; const NdbTableImpl& t = table->m_impl;
const NdbEventImpl* ev = getEvent(ev_name); const NdbEventImpl* ev = getEvent(ev_name);
assert(ev != NULL && ev->m_tableImpl == &t); assert(ev != NULL);
Uint32 i; Uint32 i;
for (i = 0; i < t.m_columns.size(); i++) { for (i = 0; i < t.m_columns.size(); i++) {
assert(t.m_columns[i] != NULL); assert(t.m_columns[i] != NULL);
......
...@@ -267,6 +267,7 @@ class NdbEventImpl : public NdbDictionary::Event, public NdbDictObjectImpl { ...@@ -267,6 +267,7 @@ class NdbEventImpl : public NdbDictionary::Event, public NdbDictObjectImpl {
friend class NdbEventOperationImpl; friend class NdbEventOperationImpl;
friend class NdbEventBuffer; friend class NdbEventBuffer;
friend class EventBufData_hash; friend class EventBufData_hash;
friend class NdbBlob;
public: public:
NdbEventImpl(); NdbEventImpl();
NdbEventImpl(NdbDictionary::Event &); NdbEventImpl(NdbDictionary::Event &);
......
...@@ -335,7 +335,6 @@ NdbEventOperationImpl::getBlobHandle(const NdbColumnImpl *tAttrInfo, int n) ...@@ -335,7 +335,6 @@ NdbEventOperationImpl::getBlobHandle(const NdbColumnImpl *tAttrInfo, int n)
NdbEventOperationImpl* tLastBlopOp = NULL; NdbEventOperationImpl* tLastBlopOp = NULL;
while (tBlobOp != NULL) { while (tBlobOp != NULL) {
if (strcmp(tBlobOp->m_eventImpl->m_name.c_str(), bename) == 0) { if (strcmp(tBlobOp->m_eventImpl->m_name.c_str(), bename) == 0) {
assert(tBlobOp->m_eventImpl->m_tableImpl == tAttrInfo->m_blobTable);
break; break;
} }
tLastBlopOp = tBlobOp; tLastBlopOp = tBlobOp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment