From: Pekka Nousiainen
Date: June 6 2011 12:18pm
Subject: bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch
 (pekka.nousiainen:4391) WL#4124
List-Archive: http://lists.mysql.com/commits/138692
Message-Id: <20110606121851.4E6DF5586E@sama.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0120931321=="

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

#At file:///export/space/pekka/ms/ms-wl4124-70/ based on revid:pekka.nousiainen@stripped

 4391 Pekka Nousiainen	2011-06-06
      wl#4124 x05_fix.diff
      CXX=gcc and __cxa_guard_acquire

    modified:
      storage/ndb/tools/ndb_index_stat.cpp
=== modified file 'storage/ndb/tools/ndb_index_stat.cpp'
--- a/storage/ndb/tools/ndb_index_stat.cpp	2011-06-06 12:18:27 +0000
+++ b/storage/ndb/tools/ndb_index_stat.cpp	2011-06-06 12:18:47 +0000
@@ -68,10 +68,10 @@ static const NdbDictionary::Index* g_ind
     break; \
   }
 
-static const NdbError&
+static NdbError
 getNdbError(Ndb_cluster_connection* ncc)
 {
-  static NdbError err;
+  NdbError err;
   err.code = g_ncc->get_latest_error();
   err.message = g_ncc->get_latest_error_msg();
   return err;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pekka.nousiainen@stripped\
#   l3amzcgo5ybujhat
# target_branch: file:///export/space/pekka/ms/ms-wl4124-70/
# testament_sha1: d8294b39ad7ef4f2cab35f34d354080574c582ff
# timestamp: 2011-06-06 15:18:51 +0300
# source_branch: bzr+ssh://pnousiainen@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: pekka.nousiainen@stripped\
#   r8sgvjr0trpvzpw9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYL9RBIAAXDfgAAQWGP//1oB
QEC////wUANN170m96083dwGSEm00U8U9TzIIaQYTNT1B6hpoJShlHoYJMEAEGExDQYBkKehJhNT
ymaR5EDIekNDRoMMlGp6amRpvVNqaNNAAAAaAElNKntBoajaCaJ6JB6hpo0HqZDVQ+Xq99BU+Oor
hRymIHJr3sS5i1uUlXFiIh+MgKWag7BmRUVlhHT5721WcP587oRVo08Xr6KNpVCPmyeQ4gi4Wq3x
6xSD4QB74lYpIcfuAkLDaja5yNJpTLBOVAKxmF6axW4BUETLc6FTMMxWjDqAqBYJ1+mUQDsxODRB
M+0R+7yXSl8yPeO4q8522lRjvsPHgGThZuLR0cT7blDjgCMEGEiMMoNqVO6VB0FjY2S+uWD3XRvg
w/scG0E1w8kQDxhbcasOwr1qLxOJjhw8YZ+PeNKFod1so/MVvcCxHCKyVRMlu0b1JSpWSa0qwmZS
ApCzHIXTNqqWOxRrJZoppLBi43lMqIOc8nMNGCmscXhY9gU0KmGvH6F31ouBBqEkO9EiT9hTe4tz
Z2alHkoi7GBCxSAcCLpouyFm6+hL9yDl3+/OIkOjRAiaKVrEx3u0XN+7N0k3fKVkZezBkYsgCwDA
UVBG/sO6okLLLCRzIM0zgWPu8JCFFSBxSBEg37NArHK8G0X7MwcSLHcKliWUSpn4LuwBubIiEjoS
KEK4vHZZrYT1iBcoxx/AwFNtLGrES4T+0kAO9UwCHaIMtD8a68UVK0jc3XzF91NKCJ/V5IonjTVo
oRgGwdihnxsdt392FokAaYyu1qXCdWY4lQdZQodYU+dah5dk6D06i5CqmH8eMFQqsBvpcGOhSC1b
3Db7bk6jitExPyCCwBXf7Ob5Bth0DnfR8pQE0A4EgWBuDMB5IAwK5gJTuBjOSEF0LIZSQkajC6Qt
eaYoDNIwoSEoYGAV1osJahBXkSLJEKFDRxBlinANgDhbEB2JCiGm9RbfniSIi+/OFqIWBAICARW2
ax2K5QmGIeZRUctPgEVTyCukAwqqciPOZZtUtW3xHhR6DodnLw4Q1hdl1Bid+gKYNWutnKPR0FlE
IuzRs5DpliHPt0JvxdnWfa6xEQ8ggyn5nxyo9dhX5xYFYswrDjsBv0llSvDsy3JhZ8xUlHULvYXc
kU4UJCC/UQSA


--===============0120931321==--