summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2006-12-08 17:21:29 +0100
committerjonas@perch.ndb.mysql.com <>2006-12-08 17:21:29 +0100
commit3358f4f14b0b089a0a5af055d0fbfc3041def745 (patch)
treefc2261ebfdda0fe2469f5af4b49e1295646b0118 /storage
parent6f01db228568789329eea47a5c72a241f09e7356 (diff)
downloadmariadb-git-3358f4f14b0b089a0a5af055d0fbfc3041def745.tar.gz
ndb - bug#24917
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/lgman.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/lgman.cpp b/storage/ndb/src/kernel/blocks/lgman.cpp
index 50741f37fcf..17a4c4a4a83 100644
--- a/storage/ndb/src/kernel/blocks/lgman.cpp
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp
@@ -2063,6 +2063,7 @@ Lgman::execSTART_RECREQ(Signal* signal)
if(ptr.i != RNIL)
{
infoEvent("Applying undo to LCP: %d", m_latest_lcp);
+ ndbout_c("Applying undo to LCP: %d", m_latest_lcp);
find_log_head(signal, ptr);
return;
}
@@ -2682,13 +2683,14 @@ Lgman::execute_undo_record(Signal* signal)
case File_formats::Undofile::UNDO_LCP_FIRST:
{
Uint32 lcp = * (ptr - len + 1);
- if(lcp > m_latest_lcp)
+ if(m_latest_lcp && lcp > m_latest_lcp)
{
// Just ignore
break;
}
- if(lcp < m_latest_lcp ||
+ if(m_latest_lcp == 0 ||
+ lcp < m_latest_lcp ||
(lcp == m_latest_lcp &&
mask == File_formats::Undofile::UNDO_LCP_FIRST))
{