Commit d8a5d43c authored by unknown's avatar unknown
Browse files

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

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


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents a50426e1 40bfc4c0

storage/ndb/src/common/debugger/EventLogger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = { 
  ROW(NDBStopCompleted,        LogLevel::llStartUp,     1, Logger::LL_INFO ),

  ROW(NDBStopForced,           LogLevel::llStartUp,     1, Logger::LL_ALERT ),

  ROW(NDBStopAborted,          LogLevel::llStartUp,     1, Logger::LL_INFO ),

  ROW(StartREDOLog,            LogLevel::llStartUp,    10, Logger::LL_INFO ),

  ROW(StartREDOLog,            LogLevel::llStartUp,     4, Logger::LL_INFO ),

  ROW(StartLog,                LogLevel::llStartUp,    10, Logger::LL_INFO ),

  ROW(UNDORecordsExecuted,     LogLevel::llStartUp,    15, Logger::LL_INFO ),

  ROW(StartReport,             LogLevel::llStartUp,     4, Logger::LL_INFO ),

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

+4 −0
Original line number Diff line number Diff line
@@ -12205,6 +12205,10 @@ void Dblqh::execFSCLOSECONF(Signal* signal) 
    // Set the prev file to check if we shall close it.

    logFilePtr.i = logFilePtr.p->prevLogFile;

    ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);









    logPartPtr.i = logFilePtr.p->logPartRec;









    ptrCheckGuard(logPartPtr, clogPartFileSize, logPartRecord);

















    exitFromInvalidate(signal);









    return;









  case LogFileRecord::CLOSING_INIT: