Commit 0450025c authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents 5291981c 4415af75

sql/ha_ndbcluster_binlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -3924,9 +3924,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
                              "%ld(%d e/s), total time %ld(%d e/s)",

                              (ulong)gci, event_count,

                              write_timer.elapsed_ms(),

                              event_count / write_timer.elapsed_ms(),

                              (1000*event_count) / write_timer.elapsed_ms(),

                              gci_timer.elapsed_ms(),

                              event_count / gci_timer.elapsed_ms());

                              (1000*event_count) / gci_timer.elapsed_ms());

#endif

      }

    }

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+2 −1
Original line number Diff line number Diff line
@@ -7209,6 +7209,7 @@ void Dblqh::execACC_ABORTCONF(Signal* signal) 
  signal->theData[0] = regTcPtr->tupConnectrec;

  EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);









  jamEntry(); 









  continueAbortLab(signal);









  return;









}//Dblqh::execACC_ABORTCONF()