bzr commit into mysql-5.1-telco-6.2 branch (jorgen.austvik:2983) Bug#42789

[Jorgen Austvik]

#At file:///devel/mysql/mysql-5.1-telco-6.2/ based on revid:frazer@stripped

 2983 Jorgen Austvik	2009-09-08
      bug#42789: initialize ndbout

    modified:
      storage/ndb/include/util/NdbOut.hpp
      storage/ndb/src/common/util/NdbOut.cpp
      storage/ndb/src/common/util/ndb_init.cpp
=== modified file 'storage/ndb/include/util/NdbOut.hpp'
--- a/storage/ndb/include/util/NdbOut.hpp	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/include/util/NdbOut.hpp	2009-09-08 12:58:50 +0000
@@ -76,6 +76,7 @@ public:
   NdbOut& flushline(void);
   NdbOut& setHexFormat(int _format);
   
+  NdbOut();
   NdbOut(OutputStream &);
   virtual ~NdbOut();
 

=== modified file 'storage/ndb/src/common/util/NdbOut.cpp'
--- a/storage/ndb/src/common/util/NdbOut.cpp	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/src/common/util/NdbOut.cpp	2009-09-08 12:58:50 +0000
@@ -21,8 +21,8 @@
 #include <NdbOut.hpp>
 #include <OutputStream.hpp>
 
-static FileOutputStream ndbouts_fileoutputstream(stdout);
-NdbOut ndbout(ndbouts_fileoutputstream);
+/* Initialized in ndb_init() */
+NdbOut ndbout;
 
 static const char * fms[] = {
   "%d", "0x%02x",      // Int8
@@ -87,6 +87,14 @@ NdbOut& NdbOut::setHexFormat(int _format
   return *this;
 }
 
+NdbOut::NdbOut()
+  : m_out(NULL), isHex(0)
+{
+   /**
+    * m_out set to NULL!
+    */
+}
+
 NdbOut::NdbOut(OutputStream & out) 
   : m_out(& out)
 {
@@ -95,6 +103,10 @@ NdbOut::NdbOut(OutputStream & out) 
 
 NdbOut::~NdbOut()
 {
+   /**
+    *  don't delete m_out, as it's a reference given to us.
+    *  i.e we don't "own" it
+    */
 }
 
 void

=== modified file 'storage/ndb/src/common/util/ndb_init.cpp'
--- a/storage/ndb/src/common/util/ndb_init.cpp	2009-07-15 18:14:13 +0000
+++ b/storage/ndb/src/common/util/ndb_init.cpp	2009-09-08 12:58:50 +0000
@@ -19,6 +19,8 @@
 #include <ndb_global.h>
 #include <my_sys.h>
 #include <NdbMutex.h>
+#include <OutputStream.hpp>
+#include <util/NdbOut.hpp>
 
 class EventLogger *g_eventLogger = NULL;
 
@@ -68,6 +70,7 @@ ndb_init()
   if (ndb_init_called == 0)
   {
     ndb_init_called = 1;
+    new (&ndbout) NdbOut(*(new FileOutputStream(stdout)));
     if (my_init())
     {
       const char* err = "my_init() failed - exit\n";


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