bk commit into 5.1 tree (tomas:1.2199) BUG#17297

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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.2199 06/06/20 19:17:07 tomas@stripped +4 -0
  Bug #17297 Fix error messages

  storage/ndb/src/ndbapi/ndberror.c
    1.62 06/06/20 19:16:54 tomas@stripped +1 -0
    Bug #17297 Fix error messages

  storage/ndb/src/kernel/error/ndbd_exit_codes.c
    1.9 06/06/20 19:16:54 tomas@stripped +1 -0
    Bug #17297 Fix error messages

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.88 06/06/20 19:16:53 tomas@stripped +3 -2
    Bug #17297 Fix error messages

  storage/ndb/include/mgmapi/ndbd_exit_codes.h
    1.10 06/06/20 19:16:53 tomas@stripped +4 -0
    Bug #17297 Fix error messages

# 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.1-new-ndb

--- 1.87/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-04-25 14:02:07 +02:00
+++ 1.88/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-06-20 19:16:53 +02:00
@@ -1355,10 +1355,11 @@
       sf->FileSize == sf0->FileSize &&
       sf->PageNumber == n &&
       computeChecksum((Uint32*)sf, NDB_SF_PAGE_SIZE_IN_WORDS) == 0;
-    ndbrequire(ok || !crashInd);
+    ndbrequireErr(ok || !crashInd, NDBD_EXIT_SR_SCHEMAFILE);
     if (! ok) {
       jam();
-      ndbrequire(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1);
+      ndbrequireErr(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1,
+                    NDBD_EXIT_SR_SCHEMAFILE);
       readSchemaRef(signal, fsPtr);
       return;
     }

--- 1.9/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2006-03-24 07:35:35 +01:00
+++ 1.10/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2006-06-20 19:16:53 +02:00
@@ -77,6 +77,7 @@
 #define NDBD_EXIT_SR_RESTARTCONFLICT          2311
 #define NDBD_EXIT_NO_MORE_UNDOLOG             2312 
 #define NDBD_EXIT_SR_UNDOLOG                  2313 
+#define NDBD_EXIT_SR_SCHEMAFILE               2310
 #define NDBD_EXIT_MEMALLOC                    2327
 #define NDBD_EXIT_BLOCK_JBUFCONGESTION        2334
 #define NDBD_EXIT_TIME_QUEUE_SHORT            2335
@@ -90,6 +91,9 @@
 #define NDBD_EXIT_NDBASSERT                   2343
 #define NDBD_EXIT_INVALID_CONFIG              2350
 #define NDBD_EXIT_OUT_OF_LONG_SIGNAL_MEMORY   2351
+
+/* Errorcodes for fatal resource errors */
+#define NDBD_EXIT_RESOURCE_ALLOC_ERROR        2500
 
 #define NDBD_EXIT_OS_SIGNAL_RECEIVED          6000
 

--- 1.8/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2006-06-20 15:45:07 +02:00
+++ 1.9/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2006-06-20 19:16:54 +02:00
@@ -59,6 +59,7 @@
    {NDBD_EXIT_NODE_NOT_DEAD, XRE, "Internal node state conflict, "
     "most probably resolved by restarting node again"},
    {NDBD_EXIT_SR_REDOLOG, XFI, "Error while reading the REDO log"},
+   {NDBD_EXIT_SR_SCHEMAFILE, XFI, "Error while reading the schema file"},
    /* Currently unused? */
    {2311, XIE, "Conflict when selecting restart type"},
    {NDBD_EXIT_NO_MORE_UNDOLOG, XCR,

--- 1.61/storage/ndb/src/ndbapi/ndberror.c	2006-06-12 14:35:56 +02:00
+++ 1.62/storage/ndb/src/ndbapi/ndberror.c	2006-06-20 19:16:54 +02:00
@@ -344,6 +344,7 @@
   /**
    * SchemaError
    */
+  { 311,  DMEC, IE, "Undefined fragment" },
   { 703,  DMEC, SE, "Invalid table format" },
   { 704,  DMEC, SE, "Attribute name too long" },
   { 705,  DMEC, SE, "Table name too long" },