List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:September 28 2010 7:13am
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3836 to 3837)
View as plain text  
 3837 Martin Zaun	2010-09-28 [merge]
      ndbjtie - merge fix jtie unit test

    modified:
      storage/ndb/src/ndbjtie/jtie/test/myapi/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am
 3836 Jonas Oreland	2010-09-27 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== 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
 


Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20100928071226-kq4slvxe45kuo39u.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3836 to 3837) Martin Zaun28 Sep