bk commit into 5.1-ndb tree (joreland:1.1848)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
5.1-ndb repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1848 05/04/13 16:37:54 joreland@stripped +2 -0
  wl1870 - ndb diskdata
    fix file change during cut log tail
    fix init lcp id during SR

  ndb/src/kernel/blocks/lgman.cpp
    1.30 05/04/13 16:37:50 joreland@stripped +3 -2
    Fix

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.66 05/04/13 16:37:50 joreland@stripped +2 -2
    Fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.ndb.mysql.com.ndb.mysql.com.ndb.mysql.com.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.29/ndb/src/kernel/blocks/lgman.cpp	Wed Apr 13 16:10:00 2005
+++ 1.30/ndb/src/kernel/blocks/lgman.cpp	Wed Apr 13 16:37:50 2005
@@ -1114,9 +1114,10 @@
 Lgman::cut_log_tail(Signal* signal, Ptr<Logfile_group> ptr)
 {
   Buffer_idx tmp= ptr.p->m_tail_pos[0];
-  Ptr<Undofile> filePtr;
-  m_file_pool.getPtr(filePtr, tmp.m_ptr_i);
   Buffer_idx tail= ptr.p->m_file_pos[TAIL];
+
+  Ptr<Undofile> filePtr;
+  m_file_pool.getPtr(filePtr, tail.m_ptr_i);
 
   printf("tmp: [ %d %d ] tail: [ %d %d ] ",
 	 tmp.m_ptr_i, tmp.m_idx, tail.m_ptr_i, tail.m_idx);

--- 1.65/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	Wed Apr 13 14:18:20 2005
+++ 1.66/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	Wed Apr 13 16:37:50 2005
@@ -12859,8 +12859,8 @@
     return;
   }//if
 
-  ndbrequire(c_lcpId == 0 || c_lcpId == lcpId);
-  c_lcpId = lcpId;
+  c_lcpId = (c_lcpId == 0 ? lcpId : c_lcpId);
+  c_lcpId = (c_lcpId < lcpId ? c_lcpId : lcpId);
   c_lcp_waiting_fragments.add(fragptr);
   if(c_lcp_restoring_fragments.isEmpty())
     send_restore_lcp(signal);