Commit 13a81d45 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/space/pekka/ndb/version/my51
parents 5c9afee6 449cc240

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ ndb_autodiscover : Needs to be fixed w.r.t binlog 
ndb_autodiscover2       : Needs to be fixed w.r.t binlog

ndb_binlog_basic        : Results are not deterministic, Tomas will fix

ndb_binlog_ddl_multi    : Bug#17038 [PATCH PENDING]

ndb_dd_backuprestore    : Bug#17045 NdbDictionaryImpl::fix_blob_events causes core 

ndb_dd_backuprestore    : Need to fix result

ndb_load                : Bug#17233

partition_03ndb         : Bug#16385

ps_7ndb                 : dbug assert in RBR mode when executing test suite

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+1 −3
Original line number Diff line number Diff line
@@ -350,10 +350,8 @@ NdbEventOperationImpl::getBlobHandle(const NdbColumnImpl *tAttrInfo, int n) 
      // to hide blob op it is linked under main op, not under m_ndb

      NdbEventOperation* tmp =

        m_ndb->theEventBuffer->createEventOperation(bename, m_error);

      if (tmp == NULL) {

        m_error.code = m_ndb->theEventBuffer->m_error.code;

      if (tmp == NULL)

        DBUG_RETURN(NULL);

      }

      tBlobOp = &tmp->m_impl;



      // pointer to main table op

storage/ndb/tools/restore/consumer_restore.cpp

+7 −0
Original line number Diff line number Diff line
@@ -748,10 +748,17 @@ BackupRestore::table(const TableS & table){ 
      my_event.addTableEvent(NdbDictionary::Event::TE_ALL);



      // add all columns to the event

      bool has_blobs = false;

      for(int a= 0; a < tab->getNoOfColumns(); a++)

      {

	my_event.addEventColumn(a);

        NdbDictionary::Column::Type t = tab->getColumn(a)->getType();

        if (t == NdbDictionary::Column::Blob ||

            t == NdbDictionary::Column::Text)

          has_blobs = true;

      }

      if (has_blobs)

        my_event.mergeEvents(true);



      while ( dict->createEvent(my_event) ) // Add event to database

      {