bk commit into 5.0 tree (tomas:1.2010) BUG#13197

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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.2010 05/10/03 20:41:43 tomas@stripped +4 -0
  Bug #13197  	NDB needs better error message for not enough memory.
  - added 2 new error codes for out of data and index memory during SR
  
  + removed c++ style comments from c file

  ndb/src/kernel/error/ndbd_exit_codes.c
    1.4 05/10/03 20:41:36 tomas@stripped +12 -4
    Bug #13197  	NDB needs better error message for not enough memory.
    - added 2 new error codes for out of data and index memory during SR
    
    + removed c++ style comments from c file

  ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
    1.6 05/10/03 20:41:36 tomas@stripped +1 -1
    Bug #13197  	NDB needs better error message for not enough memory.
    - added 2 new error codes for out of data and index memory during SR

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.57 05/10/03 20:41:36 tomas@stripped +1 -1
    Bug #13197  	NDB needs better error message for not enough memory.
    - added 2 new error codes for out of data and index memory during SR

  ndb/include/mgmapi/ndbd_exit_codes.h
    1.5 05/10/03 20:41:35 tomas@stripped +4 -0
    Bug #13197  	NDB needs better error message for not enough memory.
    - added 2 new error codes for out of data and index memory during SR

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0

--- 1.56/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-10-03 20:04:25 +02:00
+++ 1.57/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-10-03 20:41:36 +02:00
@@ -8158,7 +8158,7 @@
   for (Uint32 i = 0; i < limitLoop; i++) {
     jam();
     seizePage(signal);
-    ndbrequire(tresult <= ZLIMIT_OF_ERROR);
+    ndbrequireErr(tresult <= ZLIMIT_OF_ERROR, NDBD_EXIT_SR_OUT_OF_INDEXMEMORY);
     fragrecptr.p->datapages[i] = spPageptr.i;
     signal->theData[i + 6] = spPageptr.i;
   }//for

--- 1.5/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp	2005-01-11 23:25:40 +01:00
+++ 1.6/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp	2005-10-03 20:41:36 +02:00
@@ -187,7 +187,7 @@
   const Uint32 pageCount = riPtr.p->sriNumDataPages - regFragPtr.p->noOfPages;
   if(pageCount > 0){
     Uint32 noAllocPages = allocFragPages(regFragPtr.p, pageCount);
-    ndbrequire(noAllocPages == pageCount);
+    ndbrequireErr(noAllocPages == pageCount, NDBD_EXIT_SR_OUT_OF_DATAMEMORY);
   }//if
   ndbrequire(getNoOfPages(regFragPtr.p) == riPtr.p->sriNumDataPages);
 

--- 1.4/ndb/include/mgmapi/ndbd_exit_codes.h	2005-10-03 20:04:27 +02:00
+++ 1.5/ndb/include/mgmapi/ndbd_exit_codes.h	2005-10-03 20:41:35 +02:00
@@ -102,6 +102,10 @@
 /* TC  6200-> */
 /* DIH 6300-> */
 #define NDBD_EXIT_MAX_CRASHED_REPLICAS        6300
+/* ACC 6600-> */
+#define NDBD_EXIT_SR_OUT_OF_INDEXMEMORY       6600
+/* TUP 6800-> */
+#define NDBD_EXIT_SR_OUT_OF_DATAMEMORY        6800
 /* LQH 7200-> */
 
 

--- 1.3/ndb/src/kernel/error/ndbd_exit_codes.c	2005-10-03 20:04:27 +02:00
+++ 1.4/ndb/src/kernel/error/ndbd_exit_codes.c	2005-10-03 20:41:36 +02:00
@@ -71,7 +71,7 @@
    {NDBD_EXIT_INVALID_CONFIG, XCE,
     "Invalid Configuration fetched from Management Server" },
 
-   // VM
+   /* VM */
    {NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY,    XCE,
     "Signal lost, out of long signal memory"},
    {NDBD_EXIT_WATCHDOG_TERMINATE,           XIE, "WatchDog terminate"},
@@ -80,10 +80,18 @@
    {NDBD_EXIT_SIGNAL_LOST,    XIE, "Signal lost (unknown reason)"},
    {NDBD_EXIT_ILLEGAL_SIGNAL, XCE, "Illegal signal (version mismatch?)"},
 
-   // DIH
+   /* DIH */
    {NDBD_EXIT_MAX_CRASHED_REPLICAS, XFI, "To many crasched replicas"},
 
-   // Ndbfs error messages
+   /* ACC */
+   {NDBD_EXIT_SR_OUT_OF_INDEXMEMORY, XCE,
+    "Out of index memory during system restart"},
+
+   /* TUP */
+   {NDBD_EXIT_SR_OUT_OF_DATAMEMORY, XCE,
+    "Out of data memory during system restart"},
+
+   /* Ndbfs error messages */
    {NDBD_EXIT_AFS_NOPATH,       XCE, "No file system path"},
    {2802,                       XIE, "Channel is full"},
    {2803,                       XIE, "No more threads"},
@@ -102,7 +110,7 @@
    {NDBD_EXIT_AFS_NO_SUCH_FILE          , XFI, "File not found"},
    {NDBD_EXIT_AFS_READ_UNDERFLOW        , XIE, "Read underflow"},
 
-   // Sentinel
+   /* Sentinel */
    {0, XUE, "No message slogan found"}
 };