bzr commit into mysql-5.1-telco-7.0 branch (jonas:4041) Bug#58638

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4041 jonas oreland	2010-12-02
      ndb - bug#58638 - look at lsn before looking at table/fragment meta-data

    modified:
      storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp	2010-03-26 11:52:10 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp	2010-12-02 06:40:30 +0000
@@ -368,6 +368,14 @@ DbtupProxy::disk_restart_undo_callback(S
       ndbrequire(page_type == File_formats::PT_Tup_fixsize_page ||
                  page_type == File_formats::PT_Tup_varsize_page);
 
+      Uint64 page_lsn = (Uint64(header.m_page_lsn_hi) << 32) + header.m_page_lsn_lo;
+      if (! (undo.m_lsn <= page_lsn))
+      {
+        jam();
+        undo.m_actions |= Proxy_undo::NoExecute;
+        undo.m_actions |= Proxy_undo::SendUndoNext;
+      }
+
       undo.m_table_id = page->m_table_id;
       undo.m_fragment_id = page->m_fragment_id;
       D("proxy: callback" << V(undo.m_table_id) << V(undo.m_fragment_id));


Attachment: [text/bzr-bundle] bzr/[e-mail]