bk commit into 5.1 tree (pekka:1.2143) BUG#17045

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2143 06/02/21 02:27:23 pekka@stripped +3 -0
  ndb - fix event created by ndb_restore  bug#17045 (not really)

  storage/ndb/tools/restore/consumer_restore.cpp
    1.29 06/02/21 02:05:30 pekka@stripped +7 -0
    surprise - ndb_restore creates events

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.43 06/02/21 02:04:23 pekka@stripped +1 -3
    error code was clobbered

  mysql-test/t/disabled.def
    1.81 06/02/21 02:03:48 pekka@stripped +1 -1
    leave ndb_dd_backuprestore disabled until *.result corrected

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51

--- 1.80/mysql-test/t/disabled.def	2006-02-20 17:19:32 +01:00
+++ 1.81/mysql-test/t/disabled.def	2006-02-21 02:03:48 +01:00
@@ -14,7 +14,7 @@
 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

--- 1.42/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-02-16 14:52:11 +01:00
+++ 1.43/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-02-21 02:04:23 +01:00
@@ -350,10 +350,8 @@
       // 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

--- 1.28/storage/ndb/tools/restore/consumer_restore.cpp	2006-02-13 14:20:25 +01:00
+++ 1.29/storage/ndb/tools/restore/consumer_restore.cpp	2006-02-21 02:05:30 +01:00
@@ -748,10 +748,17 @@
       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
       {