bzr push into mysql-5.1-telco-7.0 branch (jonas:3260 to 3262)

[Jonas Oreland]

 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
 3261 Jonas Oreland	2009-12-07
      ndb - bug#44689 - remove hard-coded usage of ndbout in ConsoleLogger, and use output stream given as input

    modified:
      storage/ndb/include/logger/ConsoleLogHandler.hpp
      storage/ndb/include/logger/Logger.hpp
      storage/ndb/src/common/logger/ConsoleLogHandler.cpp
      storage/ndb/src/common/logger/Logger.cpp
 3260 Jonas Oreland	2009-12-07 [merge]
      merge 63 to 70

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      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/include/logger/ConsoleLogHandler.hpp'
--- a/storage/ndb/include/logger/ConsoleLogHandler.hpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/include/logger/ConsoleLogHandler.hpp	2009-12-07 12:38:38 +0000
@@ -34,7 +34,7 @@ public:
   /**
    * Default constructor.
    */
-  ConsoleLogHandler(const NdbOut &out= ndbout);
+  ConsoleLogHandler(NdbOut &out= ndbout);
   /**
    * Destructor.
    */
@@ -51,7 +51,7 @@ protected:	
   virtual void writeHeader(const char* pCategory, Logger::LoggerLevel level);
   virtual void writeMessage(const char* pMsg);
   virtual void writeFooter();
-  const NdbOut& _out;
+  NdbOut& _out;
 
 private:
   /** Prohibit*/

=== modified file 'storage/ndb/include/logger/Logger.hpp'
--- a/storage/ndb/include/logger/Logger.hpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/include/logger/Logger.hpp	2009-12-07 12:38:38 +0000
@@ -136,7 +136,7 @@ public:
    *
    * @return true if successful.
    */
-  bool createConsoleHandler(const NdbOut &out= ndbout);
+  bool createConsoleHandler(NdbOut &out= ndbout);
 
   /**
    * Remove the default console handler.

=== modified file 'storage/ndb/src/common/logger/ConsoleLogHandler.cpp'
--- a/storage/ndb/src/common/logger/ConsoleLogHandler.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp	2009-12-07 12:38:38 +0000
@@ -18,7 +18,7 @@
 
 #include "ConsoleLogHandler.hpp"
 
-ConsoleLogHandler::ConsoleLogHandler(const NdbOut& out)
+ConsoleLogHandler::ConsoleLogHandler(NdbOut& out)
  : LogHandler(), _out(out)
 {
 }
@@ -53,19 +53,19 @@ void 
 ConsoleLogHandler::writeHeader(const char* pCategory, Logger::LoggerLevel level)
 {
   char str[LogHandler::MAX_HEADER_LENGTH];
-  ndbout << getDefaultHeader(str, pCategory, level);	
+  _out << getDefaultHeader(str, pCategory, level);	
 }
 
 void 
 ConsoleLogHandler::writeMessage(const char* pMsg)
 {
-  ndbout << pMsg;	
+  _out << pMsg;	
 }
 
 void 
 ConsoleLogHandler::writeFooter()
 {
-  ndbout << getDefaultFooter() << flush;
+  _out << getDefaultFooter() << flush;
 }
 
   

=== modified file 'storage/ndb/src/common/logger/Logger.cpp'
--- a/storage/ndb/src/common/logger/Logger.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/common/logger/Logger.cpp	2009-12-07 12:38:38 +0000
@@ -71,7 +71,7 @@ Logger::setCategory(const char* pCategor
 }
 
 bool
-Logger::createConsoleHandler(const NdbOut &out)
+Logger::createConsoleHandler(NdbOut &out)
 {
   Guard g(m_handler_mutex);
   bool rc = true;

=== 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]