summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorstewart@mysql.com <>2005-11-29 15:38:39 +0100
committerstewart@mysql.com <>2005-11-29 15:38:39 +0100
commitffdaaf30c6850ace62fa44485b393d8ab6ebc797 (patch)
treecfff30178f61bb4a9902ff0dd61deba26e2e1d1f /ndb
parent416cd04a519c327ef9c18e87f0277d7ba396eabe (diff)
downloadmariadb-git-ffdaaf30c6850ace62fa44485b393d8ab6ebc797.tar.gz
DbdihMain.cpp:
fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dbdih/DbdihMain.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 14ff1003ff2..4b6056aed91 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -10976,8 +10976,11 @@ void Dbdih::initCommonData()
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);