Merge monty@192.168.0.9:/my/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged

mysql-test/t/disabled.def

@@ -38,6 +38,7 @@ rpl_ndb_ddl             : master hangs
 rpl_ndb_insert_ignore : Bug #18567
 rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
+rpl_ndb_multi_update3   : Bug#18627: Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
 rpl_ndb_log             : result not deterministic, TBD if should remove
 rpl_ndb_relay_space     : Bug#16993
 #rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails

storage/ndb/src/ndbapi/NdbBlob.cpp

@@ -195,8 +195,9 @@ NdbBlob::getBlobEvent(NdbEventImpl& be, const NdbEventImpl* e, const NdbColumnIm
   assert(c->m_blobTable != NULL);
   const NdbTableImpl& bt = *c->m_blobTable;
   // blob event name
-  char bename[MAX_TAB_NAME_SIZE];
+  char bename[MAX_TAB_NAME_SIZE+1];
   getBlobEventName(bename, e, c);
+  bename[sizeof(bename)-1]= 0;
   be.setName(bename);
   be.setTable(bt);
   // simple assigments