Commit 5cbd0a52 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
parents 7e7acfbe 430ff6e5

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -44,3 +44,4 @@ rpl_sp_effects : BUG#19862 2006-06-15 mkindahl 
#rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson

crash_commit_before      : 2006-08-02 msvensson

rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)

ndb_binlog_discover      : bug#21806 2006-08-24

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1791,7 +1791,6 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op, 
      DBUG_PRINT("info", ("m_ref_count: %u for op: %p", op->m_ref_count, op));

      break;

    case NdbDictionary::Event::_TE_STOP:

      ndbout_c("sdata->ndbd_nodeid: %d", SubTableData::getNdbdNodeId(ri));

      op->m_node_bit_mask.clear(SubTableData::getNdbdNodeId(ri));

      if (op->m_node_bit_mask.isclear())

      {