diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index bcbfafccdd5f6d80491bb208fb93a1dc88a17df8..c1aa4820cae3bd4edfefc7bb167afbdf5eb05507 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -2082,23 +2082,6 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab, if (share->flags & NSF_BLOB_FLAG) op->mergeEvents(true); // currently not inherited from event - if (share->flags & NSF_BLOB_FLAG) - { - /* - * Given servers S1 S2, following results in out-of-date - * event->m_tableImpl and column->m_blobTable. - * - * S1: create table t1(a int primary key); - * S2: drop table t1; - * S1: create table t2(a int primary key, b blob); - * S1: alter table t2 add x int; - * S1: alter table t2 drop x; - * - * TODO fix at right place before we get here - */ - ndb->getDictionary()->fix_blob_events(ndbtab, event_name); - } - int n_columns= ndbtab->getNoOfColumns(); int n_fields= table ? table->s->fields : 0; // XXX ??? for (int j= 0; j < n_columns; j++) diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp index 59c73c91f6e48b19d2f04e5a60675ca113cf41f6..82c84461b13e35c5617b5328672c1d71dfd99223 100644 --- a/storage/ndb/include/ndbapi/NdbDictionary.hpp +++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp @@ -1783,7 +1783,6 @@ public: #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL const Table * getTable(const char * name, void **data) const; void set_local_table_data_size(unsigned sz); - void fix_blob_events(const Table* table, const char* ev_name); #endif }; }; diff --git a/storage/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp index 72b9ed27fec5c7383e3dadbc6ae9eeaf0402814b..e64f5968ed25dbb0714eb6938ebe549d722ef469 100644 --- a/storage/ndb/src/ndbapi/NdbDictionary.cpp +++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp @@ -1502,12 +1502,6 @@ NdbDictionary::Dictionary::getNdbError() const { return m_impl.getNdbError(); } -void -NdbDictionary::Dictionary::fix_blob_events(const Table* table, const char* ev_name) -{ - m_impl.fix_blob_events(table, ev_name); -} - // printers NdbOut& diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 46834b519bfbad5933d29970ee91144ca1e9630e..cccdb3271a9c88d80fb3397e148fdde56f11ff22 100644 --- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -4709,30 +4709,6 @@ NdbDictInterface::parseFileInfo(NdbFileImpl &dst, return 0; } -// XXX temp -void -NdbDictionaryImpl::fix_blob_events(const NdbDictionary::Table* table, const char* ev_name) -{ - const NdbTableImpl& t = table->m_impl; - const NdbEventImpl* ev = getEvent(ev_name); - assert(ev != NULL); - Uint32 i; - for (i = 0; i < t.m_columns.size(); i++) { - assert(t.m_columns[i] != NULL); - const NdbColumnImpl& c = *t.m_columns[i]; - if (! c.getBlobType() || c.getPartSize() == 0) - continue; - char bename[200]; - NdbBlob::getBlobEventName(bename, ev, &c); - // following fixes dict cache blob table - NdbEventImpl* bev = getEvent(bename); - if (c.m_blobTable != bev->m_tableImpl) { - // XXX const violation - ((NdbColumnImpl*)&c)->m_blobTable = bev->m_tableImpl; - } - } -} - template class Vector<int>; template class Vector<Uint16>; template class Vector<Uint32>; diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp index 4ada24b257ccdca681307876c5f7b5e776e77973..5da546aba0c64496410d5b29762cad18adf3dfd9 100644 --- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp +++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp @@ -604,8 +604,6 @@ public: NdbDictInterface m_receiver; Ndb & m_ndb; - // XXX temp - void fix_blob_events(const NdbDictionary::Table* table, const char* ev_name); private: NdbIndexImpl * getIndexImpl(const char * name, const BaseString& internalName);