bk commit into 5.0 tree (tomas:1.2178)

[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.2178 06/06/20 19:25:41 tomas@stripped +2 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

  ndb/src/ndbapi/ndberror.c
    1.45 06/06/20 19:25:31 tomas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.50 06/06/20 19:25:30 tomas@stripped +0 -0
    Auto merged

# 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-main/RESYNC

--- 1.49/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-01 08:28:55 +02:00
+++ 1.50/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-20 19:25:30 +02:00
@@ -8354,7 +8354,7 @@
 	     *--------_----------------------------------------------------- */
 	    const Uint32 nextCrashed = noCrashedReplicas + 1;
 	    replicaPtr.p->noCrashedReplicas = nextCrashed;
-	    arrGuard(nextCrashed, 8);
+	    arrGuardErr(nextCrashed, 8, NDBD_EXIT_MAX_CRASHED_REPLICAS);
 	    replicaPtr.p->createGci[nextCrashed] = newestRestorableGCI + 1;
 	    ndbrequire(newestRestorableGCI + 1 != 0xF1F1F1F1);
 	    replicaPtr.p->replicaLastGci[nextCrashed] = (Uint32)-1;

--- 1.44/ndb/src/ndbapi/ndberror.c	2006-06-09 10:26:34 +02:00
+++ 1.45/ndb/src/ndbapi/ndberror.c	2006-06-20 19:25:31 +02:00
@@ -266,6 +266,7 @@
   /**
    * Application error
    */
+  { 763,  AE, "Alter table requires cluster nodes to have exact same version" },
   { 823,  AE, "Too much attrinfo from application in tuple manager" },
   { 831,  AE, "Too many nullable/bitfields in table definition" },
   { 876,  AE, "876" },