bk commit into 5.0 tree (lzhou:1.2257) BUG#19787

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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@stripped, 2006-09-14 10:54:20+00:00, lzhou@stripped +1 -0
  BUG#19787 Modify correct message when some important variables are changed but cannot be
applied by online

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-09-14 10:54:18+00:00,
lzhou@stripped +7 -1
    Modify error message when illegal configuration changed.

# 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:	lzhou
# Host:	dev3-138.dev.cn.tlan
# Root:	/home/zhl/mysql/mysql-5.0/bug19787

--- 1.57/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-09-14 10:54:25 +00:00
+++ 1.58/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-09-14 10:54:25 +00:00
@@ -6488,7 +6488,13 @@
         }//for
       }
     }
-    ndbrequire(count == (2 + noOfReplicas * noOfFragments)); 
+    if(count != (2 + noOfReplicas * noOfFragments)){
+        char buf[255];
+        BaseString::snprintf(buf, sizeof(buf),
+                           "Illegal configuration change."
+                           " Can't be applied by online ");
+        progError(__LINE__, NDBD_EXIT_INVALID_CONFIG, buf);
+    }
     
     CreateFragmentationConf * const conf = 
       (CreateFragmentationConf*)signal->getDataPtrSend();