diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-02-21 18:05:06 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-02-21 18:05:06 +0100 |
| commit | 9b4d2a3afee252039d500c59fef4f987b3cd29cb (patch) | |
| tree | b70b6bd40d58b4cfd197574ff66b9ead3d113b89 /ndb | |
| parent | 659d3f4e86a08116da983e439a642b9a569f8e23 (diff) | |
| parent | 40bfc4c018414614da5d91b0c47c67f33f269e77 (diff) | |
| download | mariadb-git-9b4d2a3afee252039d500c59fef4f987b3cd29cb.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/common/debugger/EventLogger.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ndb/src/common/debugger/EventLogger.cpp b/ndb/src/common/debugger/EventLogger.cpp index 535158fb7d1..31e750d71d2 100644 --- a/ndb/src/common/debugger/EventLogger.cpp +++ b/ndb/src/common/debugger/EventLogger.cpp @@ -926,7 +926,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 ), diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index 97b47f56b10..52e7ab225ef 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -11949,6 +11949,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: |