From: Martin Zaun
Date: September 28 2010 7:10am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:3837)
List-Archive: http://lists.mysql.com/commits/119217
Message-Id: <201009280712.o8RIHELb029415@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1046562837=="

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

#At file:///Users/mz/mysql/ndb-7.1-opt64-gcc-cxx/ based on revid:jonas@stripped

 3837 Martin Zaun	2010-09-28
      ndbjtie - fix jtie unit tests on linux and macosx when building with CXX=gcc

    modified:
      storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am
=== modified file 'storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am	2010-03-12 09:30:44 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am	2010-09-28 07:10:20 +0000
@@ -68,7 +68,7 @@ myapi_test_LDADD = libmyapi.la
 ##   using -no-install requires shared libraries to be installed
 #myapi_test_LDFLAGS = -no-install ## never needs wrapper script
 myapi_test_LDFLAGS = -no-undefined ## build self-contained executable
-myapi_test_LDFLAGS += @ndb_cxx_runtime_libs@ ## Need to link with C++ runtime
+myapi_test_LDFLAGS += @ndb_cxx_runtime_libs@ ## need to link with C++ runtime
 #myapi_test_LDFLAGS += -static ## only create a static executable
 
 ## ----------------------------------------------------------------------

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	2010-04-27 12:45:23 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	2010-09-28 07:10:20 +0000
@@ -129,6 +129,7 @@ libmyjapi_la_LIBADD = ../myapi/libmyapi.
 ## mode-specific libtool options (overrides AM_LDFLAGS)
 libmyjapi_la_LDFLAGS = -no-undefined ## build self-contained library
 libmyjapi_la_LDFLAGS += -shared ## only create a shared library
+libmyjapi_la_LDFLAGS += @ndb_cxx_runtime_libs@ ## need to link with C++ runtime
 ## libmyjapi_la_LDFLAGS = -static ## only create a static library
 ## libmyjapi_la_LDFLAGS = -rpath . ## only absolute run-paths are allowed
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1-opt64-gcc-cxx/
# testament_sha1: 015eb0ddbc029e235f93f862fe2683a1a0efa0d7
# timestamp: 2010-09-28 00:10:28 -0700
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfkDG1cAAiXfgAAQWGv/93+G
CFC////wUASNLzR05cNDNKMJJEJgIMJlJ+iT9E9SbJGmanqeo9T0mgak0E008SeibUZDRoxAyaaB
poZAkSBCG1FNqejUzSGg0BgmmgaaDmAAmAAJgAAAAAJJJgQ0mJT9T0p+oynohoA0AaNDSfTr4jHO
wsqaytWy6IZwWYjjfHZFA+Boe4d4FOk4kozba7+xH6ngxj1uHnEEOvpO1R/XpObv8u6u8tLYcDt2
ejEqcERRLOdK768Op47boiZ9yeyRUb0/UeY9RhKGAyE3R+SajvzzCf3XRAbe/bLAVizHVOQfIeg2
GkjChhRLcxsyyFyASf+FNIIBDQTFNMY2GR252XMYARBWKEkikgkq7Md8X4K1ga0d7ecUg98AInpO
7U16bHlj74ynTDXF0jMWKrDIHHaiygqymmaQl2V0nYUWiqfUBTBYkEUAsrYYIb1e8cA/Xe5HgeTn
7BVXYBG4aNrhXCYyJOtMnaHHDkPv4RJT0hDaQXMUduwRx6llsWtQi5Xqhnj4zHjawjaFlcdxmKK4
m2RQfJXX0MRoESpDrExIkFZSE688JyNmUlDh1GDCXgH32BhDxyaFIUQoZABcYdgZ4srC22ypj5d6
zzC+pvLaTIWlHDlGonEwMJ5IgnzMZHr9G+GhjXKZduHG7M0s5LxAy3woC1owzEzbx6zzouRqK+Z7
wOVLeOwF655upti7ntddCbhVdJA5OawRWz6lf4GdwyOM6Rr+c/2Pb1I0Fkj9lpUYZm74J4/vO8/R
/Sp6/Ax+l3Xp2lTKwcj5Mb+H5IQhwgFGnGa/f4cvVBhF4eeeFHuRBT7C1GmKvnzGtsNCU86CVMv7
qQe3FW3WhruuPRiI4r7OGMcfSEnJIDNg5i/glPIMemgPWacpGm5RDf6S6nBt45BuEpHeRyvjY3le
WueIIAZyLnLkNHNZuWyq+WqYDRJzF0FcRyhAcmm8/dM9B6s51gly0zSscCFxHQXNJLph2clRCcvp
QbjGMheM/uNNTcOgoK5JGr93FGK6Jgxtt3SGOy2FmjQyHbC0wPLLEUJtUq+CoWRwV7EnimflN/HC
0rG5tYsxH1nRrKZBxryTR08ENEqForBPFqYRIYoozPPhrNMOpG1GepYU7lESsLI2imVPfqvqNsLV
Djt8V1BVGDgyAlfyQUQMGjzgYKr9rvmJ4vehcQGl+/OzMMmOjjzW4oMPYz2AthBY3e/yWOx7sSRJ
BChBBFxrIkjKw6FJmo14SKJwMnMDBx6x4uxc+4pskr6I1XqgVxQXoqr3LuFdi9a1zYYHJ+8KKNVn
KPJcJ6J4l0WII8KqvCyg2S1SwEUqUIVcSijRbLiawNyGYisc7M1NSQ2g6N1Ovhj3AQ3QPgDmruzR
zuU77zpuDAcImXoeDWOCefZ1Lo2rQZBbaHwE+6YFoDl0I88wf04T0Ukclet65EkxMCjloJwu0DLm
gkrnr/i7kinChIfIGNq4


--===============1046562837==--