Merge mysql.com:/space/pekka/ndb/version/my51-ndb

into mysql.com:/space/pekka/ndb/version/my51-rbr

Merge mysql.com:/space/pekka/ndb/version/my51-ndb
into mysql.com:/space/pekka/ndb/version/my51-rbr
df5b9346 · unknown · ce79bd52 · 980b7c98 · df5b9346
Commit df5b9346 authored Apr 18, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp +4 -3

No files found.
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
@@ -3840,9 +3840,10 @@ NdbDictionaryImpl::dropBlobEvents(const NdbEventImpl& evnt)
      if (! c.getBlobType() || c.getPartSize() == 0)
        continue;
      n--;
-      char bename[MAX_TAB_NAME_SIZE];
+      NdbEventImpl* blob_evnt = getBlobEvent(evnt, i);
-      NdbBlob::getBlobEventName(bename, &evnt, &c);
+      if (blob_evnt == NULL)
-      (void)dropEvent(bename);
+        continue;
+      (void)dropEvent(*blob_evnt);
    }
  } else {
    // loop over MAX_ATTRIBUTES_IN_TABLE ...