bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:2945) Bug#44746

[Magnus Blåudd]

#At file:///home/msvensson/mysql/bug44746/ based on revid:jonas@strippedofhamfto8

 2945 Magnus Blåudd	2009-05-08
      Bug#44746 NoOfReplicas should default be 2
       - Set default value for NoOfReplicase to 2
       - Remove NoOfReplicas setting from my.cnf file in ndb suite
         it's still set in rpl_ndb suite and thus we test both ways

    modified:
      mysql-test/suite/ndb/my.cnf
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'mysql-test/suite/ndb/my.cnf'
--- a/mysql-test/suite/ndb/my.cnf	2009-02-02 10:35:33 +0000
+++ b/mysql-test/suite/ndb/my.cnf	2009-05-08 14:53:10 +0000
@@ -2,7 +2,6 @@
 !include include/default_ndbd.cnf
 
 [cluster_config.1]
-NoOfReplicas=                  2
 ndbd=,
 ndb_mgmd=
 mysqld=,

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-03-20 08:25:46 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-05-08 14:53:10 +0000
@@ -481,7 +481,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     ConfigInfo::CI_USED,
     false,
     ConfigInfo::CI_INT,
-    MANDATORY,
+    "2",
     "1",
     "4" },
 

Attachment: [text/bzr-bundle] bzr/[e-mail]