bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:3591 to 3592)

[Magnus Blåudd]

 3592 Magnus Blåudd	2010-05-04 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
 3591 Jonas Oreland	2010-05-04 [merge]
      merge 70 to 71

    modified:
      mysql-test/suite/ndb/r/ndb_database.result
      mysql-test/suite/ndb/t/ndb_database.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      sql/sql_table.cc
=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2010-05-03 04:49:08 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2010-05-04 14:47:03 +0000
@@ -4310,12 +4310,6 @@ NdbDictionaryImpl::createEvent(NdbEventI
       ERR_RETURN(getNdbError(), -1);
     }
   }
-  
-#ifdef EVENT_DEBUG
-  char buf[128] = {0};
-  evnt.m_attrListBitmask.getText(buf);
-  ndbout_c("createEvent: mask = %s", buf);
-#endif
 
   // NdbDictInterface m_receiver;
   if (m_receiver.createEvent(m_ndb, evnt, 0 /* getFlag unset */) != 0)
@@ -4647,14 +4641,7 @@ NdbDictionaryImpl::getEvent(const char *
     delete ev;
     DBUG_RETURN(NULL);
   }
-#ifndef DBUG_OFF
-  char buf[128] = {0};
-  mask.getText(buf);
-  DBUG_PRINT("info",("attributeList_sz= %d, mask= %s", 
-                     attributeList_sz, buf));
-#endif
 
-  
   if ( attributeList_sz > (uint) table.getNoOfColumns() )
   {
     m_error.code = 241;

Attachment: [text/bzr-bundle] bzr/[e-mail]