bk commit into 5.1 tree (jonas:1.2490) BUG#28726

[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-06-04 11:58:25+02:00, jonas@stripped +1 -0
  ndb - bug#28726
    make sure to remove LCP files aswell if specifying --initial

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-06-04 11:58:23+02:00,
jonas@stripped +24 -6
    Add removal of LCP/X directories

# 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.45/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-06-04 11:58:30 +02:00
+++ 1.46/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2007-06-04 11:58:30 +02:00
@@ -2761,16 +2761,34 @@
   c_missra.execSTART_ORD(signal);
 }
 
+#define CLEAR_DX 13
+#define CLEAR_LCP 3
+
 void
-Ndbcntr::clearFilesystem(Signal* signal){
+Ndbcntr::clearFilesystem(Signal* signal)
+{
+  const Uint32 lcp = c_fsRemoveCount >= CLEAR_DX;
+  
   FsRemoveReq * req  = (FsRemoveReq *)signal->getDataPtrSend();
   req->userReference = reference();
   req->userPointer   = 0;
   req->directory     = 1;
   req->ownDirectory  = 1;
-  FsOpenReq::setVersion(req->fileNumber, 3);
-  FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_CTL); // Can by any...
-  FsOpenReq::v1_setDisk(req->fileNumber, c_fsRemoveCount);
+
+  if (lcp == 0)
+  {
+    FsOpenReq::setVersion(req->fileNumber, 3);
+    FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_CTL); // Can by any...
+    FsOpenReq::v1_setDisk(req->fileNumber, c_fsRemoveCount);
+  }
+  else
+  {
+    FsOpenReq::setVersion(req->fileNumber, 5);
+    FsOpenReq::setSuffix(req->fileNumber, FsOpenReq::S_DATA);
+    FsOpenReq::v5_setLcpNo(req->fileNumber, c_fsRemoveCount - CLEAR_DX);
+    FsOpenReq::v5_setTableId(req->fileNumber, 0);
+    FsOpenReq::v5_setFragmentId(req->fileNumber, 0);
+  }
   sendSignal(NDBFS_REF, GSN_FSREMOVEREQ, signal, 
              FsRemoveReq::SignalLength, JBA);
   c_fsRemoveCount++;
@@ -2779,12 +2797,12 @@
 void
 Ndbcntr::execFSREMOVECONF(Signal* signal){
   jamEntry();
-  if(c_fsRemoveCount == 13){
+  if(c_fsRemoveCount == CLEAR_DX + CLEAR_LCP){
     jam();
     sendSttorry(signal);
   } else {
     jam();
-    ndbrequire(c_fsRemoveCount < 13);
+    ndbrequire(c_fsRemoveCount < CLEAR_DX + CLEAR_LCP);
     clearFilesystem(signal);
   }//if
 }