bzr commit into mysql-5.1-telco-6.3 branch (jonas:3438) Bug#12586190

[jonas oreland]

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

 3438 jonas oreland	2011-05-24
      ndb - bug#12586190
        Fix uninitialized variables in Qmgr (move from sp1 to constructor)
        Can cause signal 11 during very early start
          as TIME_SIGNAL are sent before other blocks
          are initialized

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2011-05-24 14:51:54 +0000
@@ -69,6 +69,24 @@ void Qmgr::initData() 
   ndb_mgm_get_int_parameter(p, CFG_DB_API_HEARTBEAT_INTERVAL, &hbDBAPI);
   
   setHbApiDelay(hbDBAPI);
+
+  cfailureNr = 1;
+  ccommitFailureNr = 1;
+  cprepareFailureNr = 1;
+  cnoFailedNodes = 0;
+  cnoPrepFailedNodes = 0;
+  creadyDistCom = ZFALSE;
+  cpresident = ZNIL;
+  c_start.m_president_candidate = ZNIL;
+  c_start.m_president_candidate_gci = 0;
+  cpdistref = 0;
+  cneighbourh = ZNIL;
+  cneighbourl = ZNIL;
+  cdelayRegreq = ZDELAY_REGREQ;
+  cactivateApiCheck = 0;
+  c_allow_api_connect = 0;
+  ctoStatus = Q_NOT_ACTIVE;
+  clatestTransactionCheck = 0;
 }//Qmgr::initData()
 
 void Qmgr::initRecords() 

=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2011-05-24 14:51:54 +0000
@@ -2267,27 +2267,9 @@ void Qmgr::findNeighbours(Signal* signal
 /*---------------------------------------------------------------------------*/
 void Qmgr::initData(Signal* signal) 
 {
-  cfailureNr = 1;
-  ccommitFailureNr = 1;
-  cprepareFailureNr = 1;
-  cnoFailedNodes = 0;
-  cnoPrepFailedNodes = 0;
-  creadyDistCom = ZFALSE;
-  cpresident = ZNIL;
-  c_start.m_president_candidate = ZNIL;
-  c_start.m_president_candidate_gci = 0;
-  cpdistref = 0;
-  cneighbourh = ZNIL;
-  cneighbourl = ZNIL;
-  cdelayRegreq = ZDELAY_REGREQ;
-  cactivateApiCheck = 0;
-  c_allow_api_connect = 0;
-  ctoStatus = Q_NOT_ACTIVE;
-
   NDB_TICKS now = NdbTick_CurrentMillisecond();
   interface_check_timer.setDelay(1000);
   interface_check_timer.reset(now);
-  clatestTransactionCheck = 0;
 
   // catch-all for missing initializations
   memset(&arbitRec, 0, sizeof(arbitRec));


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