List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:August 26 2010 12:44pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (jonas:3771)
View as plain text  
#At file:///home/jonas/src/telco-7.1/ based on revid:jonas@stripped

 3771 Jonas Oreland	2010-08-26 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      support-files/compiler_warnings.supp
=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-08-26 12:33:33 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2010-08-26 12:41:30 +0000
@@ -5418,6 +5418,11 @@ Suma::execSUMA_HANDOVER_REQ(Signal* sign
   Uint32 nodeId = req->nodeId;
   Uint32 new_gci = Uint32(m_last_complete_gci >> 32) + MAX_CONCURRENT_GCP + 1;
   Uint32 requestType = req->requestType;
+  if (!ndbd_suma_stop_me(getNodeInfo(nodeId).m_version))
+  {
+    jam();
+    requestType = SumaHandoverReq::RT_START_NODE;
+  }
   
   Uint32 start_gci = (gci > new_gci ? gci : new_gci);
   // mark all active buckets really belonging to restarting SUMA
@@ -5526,6 +5531,12 @@ Suma::execSUMA_HANDOVER_CONF(Signal* sig
   ndbout_c("Suma::execSUMA_HANDOVER_CONF, gci = %u", gci);
 #endif
 
+  if (!ndbd_suma_stop_me(getNodeInfo(nodeId).m_version))
+  {
+    jam();
+    requestType = SumaHandoverReq::RT_START_NODE;
+  }
+
   if (requestType == SumaHandoverReq::RT_START_NODE)
   {
     jam();

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2010-08-26 06:47:22 +0000
+++ b/support-files/compiler_warnings.supp	2010-08-26 12:41:30 +0000
@@ -86,4 +86,24 @@ listener.cc : .*conversion from 'SOCKET'
 
 # Ignore warnings in innodb_plugin
 .*/storage/innodb_plugin/.* : .*
-
+pars0grm.c : .*
+lexyy.c : .*
+handler/i_s.cc : .*
+handler/handler0alter.cc : .*
+handler/ha_innodb.cc : .*
+trx/trx0trx.c : .*
+trx/trx0rec.c : .*
+srv/srv0start.c : .*
+row/row0upd.c : .*
+row/row0mysql.c : .*
+row/row0ins.c : .*
+page/page0zip.c : .*
+os/os0file.c : .*
+log/log0recv.c : .*
+dict/dict0mem.c : .*
+dict/dict0dict.c : .*
+dict/dict0crea.c : .*
+buf/buf0lru.c : .*
+buf/buf0buf.c : .*
+btr/btr0sea.c : .*
+btr/btr0cur.c : .*


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100826124355-qqwj4ncttq5mrh7i.bundle
Thread
bzr commit into mysql-5.1-telco-7.1 branch (jonas:3771) Jonas Oreland26 Aug