bk commit into 5.1 tree (tomas:1.2198) BUG#19543

[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.2198 06/06/20 15:45:17 tomas@stripped +2 -0
  Bug #19543 Out REDO log on subscription creation during startup, missing error message
  - add error message

  storage/ndb/src/kernel/error/ndbd_exit_codes.c
    1.8 06/06/20 15:45:07 tomas@stripped +4 -0
    Bug #19543 Out REDO log on subscription creation during startup, missing error message
    - add error message

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.43 06/06/20 15:45:06 tomas@stripped +15 -0
    Bug #19543 Out REDO log on subscription creation during startup, missing error message
    - add error message

# 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.42/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-05-18 23:37:53 +02:00
+++ 1.43/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2006-06-20 15:45:06 +02:00
@@ -410,7 +410,22 @@
   jam();
 
   if (ref != NULL)
+  {
+    switch ((UtilSequenceRef::ErrorCode)ref->errorCode)
+    {
+      case UtilSequenceRef::NoSuchSequence:
+        ndbrequire(false);
+      case UtilSequenceRef::TCError:
+      {
+        char buf[128];
+        snprintf(buf, sizeof(buf),
+                 "Startup failed during sequence creation. TC error %d",
+                 ref->TCErrorCode);
+        progError(__LINE__, NDBD_EXIT_RESOURCE_ALLOC_ERROR, buf);
+      }
+    }
     ndbrequire(false);
+  }
 
   sendSTTORRY(signal);
 }

--- 1.7/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2006-03-24 07:35:36 +01:00
+++ 1.8/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2006-06-20 15:45:07 +02:00
@@ -80,6 +80,10 @@
    /* this error message is complemented by additional info when generated */
    {NDBD_EXIT_INVALID_CONFIG, XCE,
     "Invalid configuration received from Management Server"},
+
+   {NDBD_EXIT_RESOURCE_ALLOC_ERROR, XCE,
+    "Resource allocation error, please review the configuration"},
+
    /* this error message is complemented by additional info when
       generated, such as signal, and text
    */