Commit c8caeebf authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents b3bdc112 cd25604c

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ rpl_ndb_ddl : master hangs 
rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails

rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296

rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails

#rpl_ndb_log             : result not deterministic

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

rpl_ndb_sp007           : Bug #17290

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

+3 −0
Original line number Diff line number Diff line
@@ -3829,6 +3829,9 @@ NdbDictionaryImpl::dropBlobEvents(const NdbEventImpl& evnt) 
  } else {

    // loop over MAX_ATTRIBUTES_IN_TABLE ...

    Uint32 i;

    DBUG_PRINT("info", ("missing table definition, looping over "

                        "MAX_ATTRIBUTES_IN_TABLE(%d)",

                        MAX_ATTRIBUTES_IN_TABLE));

    for (i = 0; i < MAX_ATTRIBUTES_IN_TABLE; i++) {

      char bename[MAX_TAB_NAME_SIZE];

      // XXX should get name from NdbBlob