bzr commit into mysql-5.1-telco-6.2 branch (jonas:2813)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/

 2813 Jonas Oreland	2009-02-06
      ndb - fix error message if incorrectly specified new parameters
modified:
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

=== modified file 'storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-02-06 15:19:29 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-02-06 15:39:18 +0000
@@ -2823,7 +2823,6 @@ Ndbcntr::clearFilesystem(Signal* signal)
     ndbrequire(false);
   }
 
-  ndbout_c("c_fsRemoveCount: %u", c_fsRemoveCount);
   sendSignal(NDBFS_REF, GSN_FSREMOVEREQ, signal, 
              FsRemoveReq::SignalLength, JBA);
   c_fsRemoveCount++;

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2009-02-06 15:19:29 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2009-02-06 15:39:18 +0000
@@ -176,7 +176,9 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signa
     do_mkdir(path.c_str());
     if (!validate_path(m_base_path[FsOpenReq::BP_DD_DF], path.c_str()))
     {
-      ndbrequire(false);
+      ERROR_SET(fatal, NDBD_EXIT_AFS_INVALIDPATH, 
+                m_base_path[FsOpenReq::BP_DD_DF].c_str(),
+                "FileSystemPathDataFiles");
     }
   }
 
@@ -199,7 +201,9 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signa
 
     if (!validate_path(m_base_path[FsOpenReq::BP_DD_UF], path.c_str()))
     {
-      ndbrequire(false);
+      ERROR_SET(fatal, NDBD_EXIT_AFS_INVALIDPATH, 
+                m_base_path[FsOpenReq::BP_DD_UF].c_str(),
+                "FileSystemPathUndoFiles");
     }
   }