bk commit into 5.1 tree (jonas:1.2431) BUG#27003

[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-03-13 12:38:47+01:00, jonas@stripped +3 -0
  ndb - bug#27003
    merge to 5.1, adopt testprg to optimized node recovery

  storage/ndb/include/kernel/signaldata/LqhKey.hpp@stripped, 2007-03-13 12:38:45+01:00,
jonas@stripped +1 -0
    Add Restore as friend

  storage/ndb/src/kernel/blocks/restore.cpp@stripped, 2007-03-13 12:38:45+01:00,
jonas@stripped +16 -1
    Give proper error message on LQHKEYREF

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-03-13 12:38:45+01:00,
jonas@stripped +2 -2
    post merge fix, adopt to optimized node recovery...

# 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/51-telco-gca

--- 1.12/storage/ndb/src/kernel/blocks/restore.cpp	2007-03-13 12:38:52 +01:00
+++ 1.13/storage/ndb/src/kernel/blocks/restore.cpp	2007-03-13 12:38:52 +01:00
@@ -1154,8 +1154,23 @@
 }
 
 void
-Restore::execLQHKEYREF(Signal*)
+Restore::execLQHKEYREF(Signal* signal)
 {
+  FilePtr file_ptr;
+  LqhKeyRef* ref = (LqhKeyRef*)signal->getDataPtr();
+  m_file_pool.getPtr(file_ptr, ref->connectPtr);
+  
+  char buf[255], name[100];
+  BaseString::snprintf(name, sizeof(name), "%u/T%dF%d",
+		       file_ptr.p->m_lcp_no,
+		       file_ptr.p->m_table_id,
+		       file_ptr.p->m_fragment_id);
+  
+  BaseString::snprintf(buf, sizeof(buf),
+		       "Error %d during restore of  %s",
+		       ref->errorCode, name);
+  
+  progError(__LINE__, NDBD_EXIT_INVALID_LCP_FILE, buf);  
   ndbrequire(false);
 }
 

--- 1.5/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2007-03-13 12:38:52 +01:00
+++ 1.6/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2007-03-13 12:38:52 +01:00
@@ -582,6 +582,7 @@
    * Reciver(s)
    */
   friend class Dbtc;      
+  friend class Restore;
 
   /**
    * Sender(s)

--- 1.41/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-13 12:38:52 +01:00
+++ 1.42/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-13 12:38:52 +01:00
@@ -1332,7 +1332,7 @@
 
   int node = res.getRandomNotMasterNodeId(rand());
   ndbout_c("node: %d", node);
-  if (res.restartOneDbNode(node, false, true, true))
+  if (res.restartOneDbNode(node, true, true, true))
     return NDBT_FAILED;
 
   Uint32 pos = 0;
@@ -1351,7 +1351,7 @@
       if (res.insertErrorInNode(node, errnos[pos]))
 	return NDBT_FAILED;
       
-      int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+      int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 3 };
       if (res.dumpStateOneNode(node, val2, 2))
 	return NDBT_FAILED;