From: Jonas Oreland
Date: August 26 2010 12:44pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (jonas:3771)
List-Archive: http://lists.mysql.com/commits/116871
Message-Id: <20100826124410.28194B43F4F@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2096604538669675148=="

--===============2096604538669675148==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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 : .*


--===============2096604538669675148==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.1/
# testament_sha1: 4fe82cf8028b3704a30d627440d0bfe7024fb933
# timestamp: 2010-08-26 14:44:10 +0200
# source_branch: file:///home/jonas/src/telco-6.4/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRioHKMABoNfgEAQeHP//3Zx
nAC////6YAsXfS07sdJIyKFLFNdaHW2AoABQAaUyNTTQ9QaeoeiPKDIAAAAaASiCYmjTImECU9Jk
8UAABkaD1DmmJgI0wIwjAAAAEwjASmk0mSNTxMk01PaQhoaAGgANBoOaYmAjTAjCMAAAATCMAqUg
EaAAmgMk000NTU8mmUM0g2oyBoet9S1eoPkwP2l71+4Y0/IOs+nVWtPU8Dv35jTnYK340IsntCYG
aNtXL0RepWww1GukJ2rOpcXX4sDC0pLbypN5LEfVb/P6qqOkR2n1HICYSEhISb78wHbAQVEIWGyG
h32ZZWw1iFOUmzh6xpyi4EVsoKTicd6vqeJTd4dXMMfcyNp7nkrKbP3/J1sLrnPiUoSyg4aPzjkP
c5bXazNz4hq0V4cYrb29O7d0Quum5yCHvsfEcMuF9jLucW94fGIvixuPwZgmM20+BY39DyOjSaDJ
IuR/JzdUyHX3lSOhmNjvN0Ry4TktpyEejCLqkzGUv5CapHBMp/FKlEtwPggCSCs3wgLAqZlzO1uz
F3d3cd+qsdzLw9K3ZGnP09K2MNxnJ5DopSHhdHfjIswvvKihciSjyUMEUCUK2ehdvXmUxLzr5rDl
1TLfS20uURWyLSsJ2sjLgZkXEzskMF2flhVjnsuWZFl2NokDNja04t5b47NdbUDO22eg57VBqjmM
RHg8M0U2W+43ItCWe+hgd48PQr6ryrC0uM9YOLKXsOvRp19VuFZn2JPvFVR0JXtsdvibCxOmkamx
mhTMtatm7eDxj0y64DdyJb3QHBECYbypmuoKw5zra4BWiFEQ/1N2iGLr6E92uVTyDkwKgnB1ri/D
sv3srMVyiKcaIqSVlCq6VuXX1MtVkkjTRtUz5VLdNq2LYtb+uuJtuuS8wJGGweYRBxCVXZqrxiK5
EMjPEoFTpEMnxRoVDEUnhCVSKScPh0IBHxJmAb1iIQ1MRiHc30qTLCuyqGdoClBdzzGSxK4eRcDB
tb8KpMoGKj8oPYAYCiYzTCuRZS0sCeGyEKAnKobiJWrXuCxyuY+3hhyCXFi9GKB8ESwZQi8cBFUm
BsBplpwySmZeDrtKQOJkrznFpeHcOwZc9VFOTCSqRBjCefGD46BjSbYcjIlgYmpfJ2QPa3UbQR6X
fi8lAgik/cFbjJJtK54X0PIljw5tV5R+tmO4OoMDboZW4aofqaCGMrnGKIAMBYi0ff2lAHDozvZJ
h0YePAzam/bMkYYHjvEvWxy7BqgYXE8C++ZlyxOXoILf09CZFrm+5W20aIcBUHjuG6qMb7BDuIdg
tIrmwQlPopi4aNcoWIrA6voESEBBOgV6AkOT8THB7Dr8wTmiEjsVjZyNYpxeeO0inRM62Y27GtMw
dADUbegzJ1bK9CtS5XFaKqS08IYi+EFBiTjsE9Qpk+MqDaUNLzojxCwbTasUaE9GhYHYXtuVzSsH
CmI/KxAuFvnqgvZNUpTYPDYWYYDEWWGQeoEDlb9Q8g1Mc7SptkcJtmiI1bTWnRoOKuopNJRiZyl5
tRN6hWKZrkqJQwKXDGJhkFD4P3f2GlPM2GMopR476Uooj2n3OZ5oNB/SmsQkgTAkJXfs/BLoEHAO
4xP4ZB2k30XNi1+X5MjUe1sOBYaDT7VUT0UefH4+uAsYLWV1tqehUyqJlJVQ+DDB5Lb3ljzzW1me
bT1CObh/oXMdkZKQdHEIENOebvtD0MjSvnImGSSaXHV9XI5H6F52HA/ppzkdkphkSJtaIBPALUsD
O4wjRC0GRA5OuvSLadxo0igUHCM1JgeCAZ4Ltv0cj3NR+j5L6lTy8j6FkkZB1KIpr17lqcJrpltm
b3Xsg0nwRlGbj6HtPaU++OIyZVKUGncitlavvzOB6baH2aTKdTQRNp2m99ixPsd+nNJrNRZw3vUs
K/H8us9OfUY2eCjvnV4ZXPWc5zs1QzkoeG5eS1sPJvdt3LIeChz3L+tfZS42cPItS3XPKdYtPabU
aE9xUZsa1q95BpG5MpMTlwzGJT9HHvXZ0KE5r0sc0OxSdbEsZaU7tzFm1SOhrMkyT4FIqay4xknT
dw3Z/B2cW+40zl45DL6Bn4qez9KXt5jxwMpPpV4PKxYMO4MhDRw81J5wEb3X6BwLTaGgYuB1gyBq
B5w7Fa7iW+FZesSswd3Ra8S5tLjL5qjo5IsDKzEwuMHAZJub1Txrx4uDt3Gkpfdd11UVXudqjo8W
jMzZLNHf55RbbRrH9F3uP0OKnOUT2jj7HY7Tx7uh3N8R+H6nWxpY6bNU9h6DKU0h8N8psm2kbXi7
TuejCRRVyj6HsMdDUe2T4nzJ70VHdjieC8eUTklFgs26eqJs0TRdy7+hyLzriOfYbNhvDv95uwOH
nNx2vwtDAOJ2CdgQ4nYQ7IdmQ75Bi3gYxDWM4u8pEsd8j2yE5h+NobSs6SKIcWZHwRWekPhIoWlp
UO745PSs6e8wV8r5Ft15nqcAmff2u487T5tJO1fD1OJ2KZikafNebx7DMe8twLhYlhyLDuR6Mv5Q
nM8EZ8tKJsUK1dQzlEiZTWULImg1vysS42rvqpNRXPmra3q7XyOpb3EUoTsVEqPj6uxSVOoqUc2Y
/dptLHeVmB4zBJJjIf+P1QnzL71C1nrib2WuGk2y0nu93L3sUyy8Y4nQmotNCNcyumfPzKyhK/HE
fdeV1pwkeNjVNC5QobSvKUNZWbnzPqvNu6QlC1oO1mPkfKR8GrzqerNl0qFFEsaqh44ST5GpjK8/
q/k0EfVw4nYdo0JwKdfE16IWMZurLsTLO6XXqXKinbtYssbLSZsDBxX57Vzn2IwQmX9mRyM54m0X
hv3aiwc1pkkhYBLkNQBxIC9rkJMkJMyPN+xwUUUeMhL3VZrLlJNfqXNcSjWUfN9Fazu37es7OFJ7
5SbC40upeeoqihid/UZxUZmQ7qi4YGJe+hXJMSZzE8ivhycmawm0wNiLPLubHmzJu+JqfwoUUNW2
pLzPpVPZIr0O95FxOTwbEbQyms4ouTykUl5c01Lj54H7GhpczlWnUjwZie1SweFDLI9Ueh/C+QnA
+xlrPmZsTPGk+J36jBGc4H/xdyRThQkBioHKMA==


--===============2096604538669675148==--