From: Pekka Nousiainen
Date: May 29 2011 4:01pm
Subject: bzr commit into mysql-5.1-telco-7.0-wl4124 branch (pekka.nousiainen:4387)
 WL#4124
List-Archive: http://lists.mysql.com/commits/138354
Message-Id: <20110529160150.061DD5586A@sama.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1570260409=="

--===============1570260409==
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

 4387 Pekka Nousiainen	2011-05-29
      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-05-29 13:00:16 +0000
+++ b/storage/ndb/tools/ndb_index_stat.cpp	2011-05-29 16:01:46 +0000
@@ -48,10 +48,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;


--===============1570260409==
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\
#   8ut855iw42ce7k6o
# target_branch: file:///export/space/pekka/ms/ms-wl4124-70/
# testament_sha1: c2d6f45cf9387f3e4893474456d4d2dddd2156dd
# timestamp: 2011-05-29 19:01:50 +0300
# source_branch: bzr+ssh://pnousiainen@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: pekka.nousiainen@stripped\
#   90a2rq09ifje98db
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd9PVd8AAYJfgAAQWGP//1oB
QEC////wUANZr1tN3XpjO7wZJKeyNFPKeSejZBTMUHkgeghoMomJphGhoCmjEANAaDIGRARPUzQa
KMgNBo0GmIANqUekJMI09GnqGkMhgmaJiaYEkppoI0wnqmymno1G9UNAyADJfnwyXfcgo+4tZp21
kDa3HFqZtYypUn4tREO/0A5NeK9TGIqKxXwp5bmZz9/11rkI0ypxdZzdneFQHhd3RHEEKIakD7xz
o4zmy4WsxJDTz0JEr4wpqmhhOqNyY3ZgGjATBcYwLh1CCgGbXub1/RrLC88gwW6HRwstBmE6ePpJ
QhRyMZIaATpYlppIzYWQcPCvSnILTsqdMKW7uvFREhVfk4U0Ce4Aq5ixeBsDKNBMZPIoDrsMLULJ
TRTpnWl7mDo5BQYA47KfPPmDLDUNIF7hVJQkxsLyuCZ46oYE95KKisL5s1dwv6zdSgsoYV0lqF2s
jE4inJY2g7EgMENXv2wvxlYFONdgqbPa4GukXOdWMR3AtCmsY6o1Wg0ZKOk1m0g3Lg0ROh3VwIRI
YWGVi2zWxGXo6xRBzC8hYI8OAg5I8/mLcbtCX+CDrl9aQkhrEQInNSrRKb284Jfyy6OWiQwEfGfc
OJh8wD2vCkvNq1yDDzKl5z7DftSIXZykuejghQg6+7nURcsoE9tgrnFaeLgaFhRXbcRTDgFsFo4R
Ujst+QNUbs7MC1grTElcKa/Wv78pjUoDy4oHt2TpQIrIrzk94j1wEmhBkbSjqpgXD3OWMW3FFStI
9OIrlXY/hDQgwf2eSHNwRnVQYAXjUocnurwzm32iMCIsMFvrHNiHIMPMy5dVe+VQcRi35nFwo+N0
Brgop88rAhQTgsJGtz1JpcFetScQiE6gC0csIO32hj0ZBs4itm8YuWl2J3igC7iOoNgL6YGqCm2X
FlGpIY1z3z9dLJHuTY6FVB3HtuMCauCdKzm1+UmYR6WArQpWGI4RXmlnpSJEsMZku4KQVBmkKM3H
6BQKsm7FFmHCAZjMIuyVK8TrfgZtgNWVRyg4ACb3oRV0XCrXE5KnkGhX0CM1Q+W5ta5vveoTbgDs
AVEc47G3os1NAkTb0oMQUJuDyERyF3AUzRk8b7HkQAWgz8cFfr8GpAPEHkHHIDThEGWacGHeoMoN
hkJtDl3f4u5IpwoSG+nqu+A=


--===============1570260409==--