bzr commit into mysql-5.1-telco-7.0 branch (jonas:3262)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

 3262 Jonas Oreland	2009-12-07 [merge]
      merge 63 to 70

    modified:
      mysql-test/suite/ndb/ndb_config_mycnf1.cnf
      mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/t/ndb_config.test
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'mysql-test/suite/ndb/ndb_config_mycnf1.cnf'
--- a/mysql-test/suite/ndb/ndb_config_mycnf1.cnf	2009-08-31 12:59:43 +0000
+++ b/mysql-test/suite/ndb/ndb_config_mycnf1.cnf	2009-12-07 13:10:38 +0000
@@ -13,3 +13,9 @@ DataMemory=25M
 
 [cluster_config.ndbd.2.jonas]
 DataMemory=35M
+
+[cluster_config.bug44689]
+NoOfReplicas=2
+ndbd = 192.168.0.1,192.168.0.2,192.168.0.3,192.168.0.4
+ndb_mgmd = 192.168.0.1
+mysqld = 192.168.0.1

=== modified file 'mysql-test/suite/ndb/r/ndb_config.result'
--- a/mysql-test/suite/ndb/r/ndb_config.result	2009-10-07 08:07:38 +0000
+++ b/mysql-test/suite/ndb/r/ndb_config.result	2009-12-07 13:10:38 +0000
@@ -27,3 +27,5 @@ tcp,3,4,55,3 tcp,3,5,55,3 tcp,3,6,55,3 t
 3 1 2
 == 14 == ndb_config --configinfo
 == 15 == ndb_config --configinfo --xml
+== 16 == bug44689
+192.168.0.1 192.168.0.1 192.168.0.1 192.168.0.2 192.168.0.3 192.168.0.4

=== modified file 'mysql-test/suite/ndb/t/ndb_config.test'
--- a/mysql-test/suite/ndb/t/ndb_config.test	2009-08-31 12:59:43 +0000
+++ b/mysql-test/suite/ndb/t/ndb_config.test	2009-12-07 13:10:38 +0000
@@ -46,3 +46,5 @@ echo == 14 == ndb_config --configinfo;
 echo == 15 == ndb_config --configinfo --xml;
 --exec $NDB_CONFIG --configinfo --xml > /dev/null
 
+echo == 16 == bug44689;
+--exec $NDB_CONFIG --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --defaults-group-suffix=.bug44689 --query=host --mycnf 2> /dev/null

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-12-07 11:14:41 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2009-12-07 13:10:38 +0000
@@ -1237,7 +1237,8 @@ void Dblqh::execREAD_CONFIG_REQ(Signal* 
   Uint64 totalmb = Uint64(cnoLogFiles) * Uint64(clogFileSize);
   Uint64 limit = totalmb / 3;
   ndbrequire(limit < Uint64(0xFFFFFFFF));
-  c_free_mb_force_lcp_limit = limit; // If less than 33% of REDO free, force LCP
+  // If less than 33% of REDO free, force LCP
+  c_free_mb_force_lcp_limit = Uint32(limit); 
   c_free_mb_tail_problem_limit = 4;  // If less than 4Mb set TAIL_PROBLEM
 
 
@@ -20524,7 +20525,7 @@ void Dblqh::writeNextLog(Signal* signal)
 
   LogPosition head = { twnlNextFileNo, twnlNextMbyte };
   LogPosition tail = { logPartPtr.p->logTailFileNo, logPartPtr.p->logTailMbyte};
-  Uint32 free_mb = free_log(head, tail, logPartPtr.p->noLogFiles, clogFileSize);
+  Uint64 free_mb = free_log(head, tail, logPartPtr.p->noLogFiles, clogFileSize);
   if (free_mb <= c_free_mb_force_lcp_limit)
   {
     jam();


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