bk commit into 5.1 tree (joreland:1.1940)

[jonas.oreland]

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
  1.1940 05/07/13 10:55:47 joreland@stripped +6 -0
  ndb diskdata
    fix bug in MM/DD snapshot >= instead of > (wrt scan pos and inserts)
    add more testing code inside LQH to effectivly test

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
    1.18 05/07/13 10:55:43 joreland@stripped +1 -0
    friend TraceLCP

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.48 05/07/13 10:55:43 joreland@stripped +1 -0
    Infoevent about LCP to restore

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
    1.15 05/07/13 10:55:43 joreland@stripped +0 -1
    remove printout

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.67 05/07/13 10:55:43 joreland@stripped +3 -1
    assert on that disk_part isn't FREE

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.53 05/07/13 10:55:43 joreland@stripped +4 -3
    Fix bug in MM/DD snapshot

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.85 05/07/13 10:55:43 joreland@stripped +36 -16
    reenable TraceLCP for testing MM/DD snapshot

# 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.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.47/storage/ndb/src/kernel/blocks/lgman.cpp	2005-07-12 14:03:28 +02:00
+++ 1.48/storage/ndb/src/kernel/blocks/lgman.cpp	2005-07-13 10:55:43 +02:00
@@ -1602,6 +1602,7 @@
 
   if(ptr.i != RNIL)
   {
+    infoEvent("Applying undo to LCP: %d", m_latest_lcp);
     find_log_head(signal, ptr);
     return;
   }

--- 1.84/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-07-11 14:47:50 +02:00
+++ 1.85/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-07-13 10:55:43 +02:00
@@ -10174,9 +10174,15 @@
 
 #ifdef NDB_DEBUG_FULL
 static struct TraceLCP {
+  void sendSignal(Uint32 ref, Uint32 gsn, Signal* signal,
+		  Uint32 len, Uint32 prio);
   void save(Signal*);
   void restore(SimulatedBlock&, Signal* sig);
   struct Sig {
+    enum { 
+      Sig_save = 0,
+      Sig_send = 1
+    } type;
     SignalHeader header;
     Uint32 theData[25];
   };
@@ -10192,20 +10198,6 @@
   CRASH_INSERTION(5010);
   LcpFragOrd * const lcpFragOrd = (LcpFragOrd *)&signal->theData[0];
 
-#ifdef NDB_DEBUG_FULL
-  if(ERROR_INSERTED(5900) || 
-     ERROR_INSERTED(5901) || 
-     ERROR_INSERTED(5902))
-  {
-    jam();
-    g_trace_lcp.save(signal);
-    infoEvent("LCP: %d", cerrorInsert);
-    signal->theData[0] = cerrorInsert;
-    EXECUTE_DIRECT(DBACC, GSN_NDB_TAMPER, signal, 1);
-    return;
-  }
-#endif  
-
   Uint32 lcpId = lcpFragOrd->lcpId;
 
   lcpPtr.i = 0;
@@ -10367,7 +10359,8 @@
 #ifdef NDB_DEBUG_FULL
   if(ERROR_INSERTED(5904))
   {
-    g_trace_lcp.save(signal);
+    g_trace_lcp.sendSignal(BACKUP_REF, GSN_BACKUP_FRAGMENT_REQ, signal, 
+			   BackupFragmentReq::SignalLength, JBB);
   }
   else
   {
@@ -17682,8 +17675,24 @@
 #ifdef NDB_DEBUG_FULL
 #ifdef ERROR_INSERT
 void
+TraceLCP::sendSignal(Uint32 ref, Uint32 gsn, Signal* signal,
+		     Uint32 len, Uint32 prio)
+{
+  Sig s;
+  s.type = Sig::Sig_send;
+  s.header = signal->header;
+  s.header.theVerId_signalNumber = gsn;
+  s.header.theReceiversBlockNumber = ref;
+  s.header.theLength = len;
+  memcpy(s.theData, signal->theData, 4 * len);
+  m_signals.push_back(s);
+  assert(signal->getNoOfSections() == 0);
+}
+
+void
 TraceLCP::save(Signal* signal){
   Sig s;
+  s.type = Sig::Sig_save;
   s.header = signal->header;
   memcpy(s.theData, signal->theData, 4 * signal->getLength());
   m_signals.push_back(s);
@@ -17696,7 +17705,18 @@
   for(Uint32 i = 0; i<cnt; i++){
     sig->header = m_signals[i].header;
     memcpy(sig->theData, m_signals[i].theData, 4 * sig->getLength());
-    lqh.executeFunction(sig->header.theVerId_signalNumber, sig);
+    switch(m_signals[i].type){
+    case Sig::Sig_send:
+      lqh.sendSignal(sig->header.theReceiversBlockNumber,
+		     sig->header.theVerId_signalNumber,
+		     sig,
+		     sig->header.theLength,
+		     JBB);
+      break;
+    case Sig::Sig_save:
+      lqh.executeFunction(sig->header.theVerId_signalNumber, sig);
+      break;
+    }
   }
   m_signals.clear();
 }

--- 1.52/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2005-07-11 14:47:50 +02:00
+++ 1.53/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2005-07-13 10:55:43 +02:00
@@ -168,9 +168,10 @@
 static
 inline
 bool
-operator>(const Local_key& key1, const Local_key& key2)
+operator>=(const Local_key& key1, const Local_key& key2)
 {
-  return key1.m_page_no >= key2.m_page_no && key1.m_page_idx >
key2.m_page_idx;
+  return key1.m_page_no > key2.m_page_no ||
+    (key1.m_page_no == key2.m_page_no && key1.m_page_idx >= key2.m_page_idx);
 }
 
 void
@@ -296,7 +297,7 @@
 	Local_key rowid = regOperPtr->m_tuple_location;
 	Local_key scanpos = scanOp.p->m_scanPos.m_key;
 	rowid.m_page_no = page->frag_page_id;
-	if(rowid > scanpos)
+	if(rowid >= scanpos)
 	{
 	  copy_bits |= Tuple_header::LCP_SKIP;
 	}

--- 1.66/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-07-06 14:52:56 +02:00
+++ 1.67/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-07-13 10:55:43 +02:00
@@ -2535,6 +2535,8 @@
     memcpy(dst_ptr, src_ptr, 4*tabPtrP->m_offsets[DD].m_fix_header_size);
     sizes[DD] = tabPtrP->m_offsets[DD].m_fix_header_size;
     
+    ndbassert(! (req_struct->m_disk_ptr->m_header_bits & Tuple_header::FREE));
+    
     if(dd_vars)
     {
       KeyReqStruct::Var_data* dst= &req_struct->m_var_data[DD];
@@ -2607,7 +2609,7 @@
     }
     // Fix diskpart
     req_struct->m_disk_ptr= (Tuple_header*)src_ptr;
-    
+    ndbassert(! (req_struct->m_disk_ptr->m_header_bits & Tuple_header::FREE));
     if(dd_vars)
     {
       KeyReqStruct::Var_data* dst= &req_struct->m_var_data[DD];

--- 1.17/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2005-04-29 16:30:28 +02:00
+++ 1.18/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2005-07-13 10:55:43 +02:00
@@ -74,6 +74,7 @@
 } NewVARIABLE;  /* 128 bits */
 
 class SimulatedBlock {
+  friend class TraceLCP;
   friend class SafeCounter;
   friend class SafeCounterManager;
   friend struct UpgradeStartup;

--- 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-07-11 14:47:50 +02:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-07-13 10:55:43 +02:00
@@ -332,7 +332,6 @@
        * Clear it so that it will show up in next LCP
        */
       ((Tuple_header*)th)->m_header_bits &= ~(Uint32)Tuple_header::LCP_SKIP;
-      ndbout << "LCP skipping row: " << key << endl;
       continue;
     }
     scan.m_state = ScanOp::Locked;