bk commit into 4.1 tree (stewart:1.2472)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
4.1 repository of stewart. When stewart 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.2472 05/11/29 08:42:36 stewart@stripped +1 -0
  DbdihMain.cpp:
    management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.26 05/11/29 08:42:05 stewart@stripped +2 -1
    management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/4.1/cleanup

--- 1.25/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-09-02 11:47:09 +02:00
+++ 1.26/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-11-29 08:42:05 +01:00
@@ -10976,7 +10976,8 @@
 
   cnoReplicas = 1;
   ndb_mgm_get_int_parameter(p, CFG_DB_NO_REPLICAS, &cnoReplicas);
-  cnoReplicas = cnoReplicas > 4 ? 4 : cnoReplicas;
+  progError(__LINE__, NDBD_EXIT_INVALID_CONFIG,
+	    "Only up to four replicas are supported. Check NoOfReplicas.");
 
   cgcpDelay = 2000;
   ndb_mgm_get_int_parameter(p, CFG_DB_GCP_INTERVAL, &cgcpDelay);