mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
unknown 2006-12-08 17:22:16 +01:00
commit d6718d6a70
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/ndb/src/kernel/blocks/lgman.cpp
View file

@ -2063,6 +2063,7 @@ Lgman::execSTART_RECREQ(Signal* signal)
if(ptr.i != RNIL) if(ptr.i != RNIL)
{ {
infoEvent("Applying undo to LCP: %d", m_latest_lcp); infoEvent("Applying undo to LCP: %d", m_latest_lcp);
ndbout_c("Applying undo to LCP: %d", m_latest_lcp);
find_log_head(signal, ptr); find_log_head(signal, ptr);
return; return;
} }
@ -2682,13 +2683,14 @@ Lgman::execute_undo_record(Signal* signal)
case File_formats::Undofile::UNDO_LCP_FIRST: case File_formats::Undofile::UNDO_LCP_FIRST:
{ {
Uint32 lcp = * (ptr - len + 1); Uint32 lcp = * (ptr - len + 1);
if(lcp > m_latest_lcp) if(m_latest_lcp && lcp > m_latest_lcp)
{ {
// Just ignore // Just ignore
break; break;
} }
if(lcp < m_latest_lcp || if(m_latest_lcp == 0 ||
lcp < m_latest_lcp ||
(lcp == m_latest_lcp && (lcp == m_latest_lcp &&
mask == File_formats::Undofile::UNDO_LCP_FIRST)) mask == File_formats::Undofile::UNDO_LCP_FIRST))
{ {