bk commit into 5.1 tree (tomas:1.2437) BUG#26490

[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.2437 07/02/21 21:13:35 tomas@stripped +2 -0
  Bug #26490 duplicate cluster error code

  storage/ndb/src/ndbapi/ndberror.c
    1.83 07/02/21 21:13:26 tomas@stripped +1 -1
    Bug #26490 duplicate cluster error code

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
    1.5 07/02/21 21:13:26 tomas@stripped +1 -1
    Bug #26490 duplicate cluster error code

# 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.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1_2

--- 1.4/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2006-12-24 02:33:29 +07:00
+++ 1.5/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2007-02-21 21:13:26 +07:00
@@ -64,7 +64,7 @@ struct CreateFilegroupRef {
     InvalidFormat = 740,
     OutOfFilegroupRecords = 765,
     InvalidExtentSize = 764,
-    InvalidUndoBufferSize = 763,
+    InvalidUndoBufferSize = 779,
     NoSuchLogfileGroup = 767,
     InvalidFilegroupVersion = 768
   };

--- 1.82/storage/ndb/src/ndbapi/ndberror.c	2007-01-23 07:25:17 +07:00
+++ 1.83/storage/ndb/src/ndbapi/ndberror.c	2007-02-21 21:13:26 +07:00
@@ -367,7 +367,7 @@ ErrorBundle ErrorCodes[] = {
   { 771,  HA_WRONG_CREATE_OPTION, AE, "Given NODEGROUP doesn't exist in this cluster" },
   { 772,  HA_WRONG_CREATE_OPTION, IE, "Given fragmentType doesn't exist" },
   { 749,  HA_WRONG_CREATE_OPTION, IE, "Primary Table in wrong state" },
-  { 763,  HA_WRONG_CREATE_OPTION, SE, "Invalid undo buffer size" },
+  { 779,  HA_WRONG_CREATE_OPTION, SE, "Invalid undo buffer size" },
   { 764,  HA_WRONG_CREATE_OPTION, SE, "Invalid extent size" },
   { 765,  DMEC, SE, "Out of filegroup records" },
   { 750,  IE, SE, "Invalid file type" },