bk commit into 4.1 tree (stewart:1.2475)

[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.2475 05/11/29 15:38:39 stewart@stripped +1 -0
  DbdihMain.cpp:
    fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.28 05/11/29 15:38:05 stewart@stripped +5 -2
    fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error

# 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.27/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-11-29 14:29:06 +01:00
+++ 1.28/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-11-29 15:38:05 +01:00
@@ -10976,8 +10976,11 @@
 
   cnoReplicas = 1;
   ndb_mgm_get_int_parameter(p, CFG_DB_NO_REPLICAS, &cnoReplicas);
-  progError(__LINE__, NDBD_EXIT_INVALID_CONFIG,
-	    "Only up to four replicas are supported. Check NoOfReplicas.");
+  if (cnoReplicas > 4)
+  {
+    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);