bk commit into 5.1 tree (jonas:1.2388)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-01-15 21:05:14+01:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  MERGE: 1.2343.9.21

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-01-15 21:05:11+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.94.1.3

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-01-15 21:05:11+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.128.1.1

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-01-15 21:05:11+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.53.1.1

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@stripped, 2007-01-15 21:05:11+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.19.1.1

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-01-15 21:05:11+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.18.1.1

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb/RESYNC

--- 1.20/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-01-15 21:05:19 +01:00
+++ 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-01-15 21:05:19 +01:00
@@ -1422,6 +1422,13 @@
 }
 
 void
+Dbtup::disk_restart_mark_no_lcp(Uint32 tableId, Uint32 fragId)
+{
+  jamEntry();
+  disk_restart_undo_lcp(tableId, fragId, Fragrecord::UC_CREATE);
+}
+
+void
 Dbtup::disk_restart_undo_lcp(Uint32 tableId, Uint32 fragId, Uint32 flag)
 {
   Ptr<Tablerec> tabPtr;

--- 1.19/storage/ndb/src/kernel/blocks/pgman.cpp	2007-01-15 21:05:19 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/pgman.cpp	2007-01-15 21:05:19 +01:00
@@ -1257,6 +1257,8 @@
 void
 Pgman::process_lcp_locked(Signal* signal, Ptr<Page_entry> ptr)
 {
+  CRASH_INSERTION(11006);
+
   ptr.p->m_last_lcp = m_last_lcp;
   if (ptr.p->m_state & Page_entry::DIRTY)
   {
@@ -2349,6 +2351,11 @@
   if (signal->theData[0] == 11005)
   {
     g_dbg_lcp = ~g_dbg_lcp;
+  }
+
+  if (signal->theData[0] == 11006)
+  {
+    SET_ERROR_INSERT_VALUE(11006);
   }
 }
 

--- 1.97/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-01-15 21:05:19 +01:00
+++ 1.98/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-01-15 21:05:19 +01:00
@@ -2915,6 +2915,17 @@
 	     takeOverPtr.p->toCurrentTabref,
 	     takeOverPtr.p->toCurrentFragid);
     replicaPtr.p->lcpIdStarted = 0;
+    BlockReference ref = calcLqhBlockRef(takeOverPtr.p->toStartingNode);
+    StartFragReq *req = (StartFragReq *)signal->getDataPtrSend();
+    req->userPtr = 0;
+    req->userRef = reference();
+    req->lcpNo = ZNIL;
+    req->lcpId = 0;
+    req->tableId = takeOverPtr.p->toCurrentTabref;
+    req->fragId = takeOverPtr.p->toCurrentFragid;
+    req->noOfLogNodes = 0;
+    sendSignal(ref, GSN_START_FRAGREQ, signal, 
+	       StartFragReq::SignalLength, JBB);
   }
   else
   {

--- 1.129/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-01-15 21:05:19 +01:00
+++ 1.130/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-01-15 21:05:19 +01:00
@@ -13835,6 +13835,7 @@
   Uint32 lcpNo = startFragReq->lcpNo;
   Uint32 noOfLogNodes = startFragReq->noOfLogNodes;
   Uint32 lcpId = startFragReq->lcpId;
+
   ndbrequire(noOfLogNodes <= 4);
   fragptr.p->fragStatus = Fragrecord::CRASH_RECOVERING;
   fragptr.p->srBlockref = startFragReq->userRef;
@@ -13889,7 +13890,16 @@
       signal->theData[1] = fragId;
       sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB);
     }
-    
+
+    if (getNodeState().getNodeRestartInProgress())
+    {
+      jam();
+      fragptr.p->fragStatus = Fragrecord::ACTIVE_CREATION;	
+    }
+
+    c_tup->disk_restart_mark_no_lcp(tabptr.i, fragId);
+    jamEntry();
+
     return;
   }//if
 
@@ -16712,8 +16722,8 @@
     ccurrentGcprec = RNIL;
     caddNodeState = ZFALSE;
     cstartRecReq = ZFALSE;
-    cnewestGci = ~0;
-    cnewestCompletedGci = ~0;
+    cnewestGci = 0;
+    cnewestCompletedGci = 0;
     crestartOldestGci = 0;
     crestartNewestGci = 0;
     csrPhaseStarted = ZSR_NO_PHASE_STARTED;

--- 1.54/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-01-15 21:05:19 +01:00
+++ 1.55/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-01-15 21:05:19 +01:00
@@ -2710,6 +2710,8 @@
     Ptr<Extent_info> m_extent_ptr;
     Local_key m_key;
   };
+
+  void disk_restart_mark_no_lcp(Uint32 table, Uint32 frag);
   
 private:
   void disk_restart_undo_next(Signal*);