List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 12 2010 9:30am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4003)
View as plain text  
#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4003 Magnus Blåudd	2010-11-12
      ndb
       - add workaround for bug58158 to fix problem with
         embedded server link failure

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-11-10 10:48:46 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-11-12 09:29:39 +0000
@@ -127,4 +127,12 @@ ELSE()
   # New plugin support, cross-platform
   MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
     DEFAULT MODULE_OUTPUT_NAME ha_ndb LINK_LIBRARIES ndbclient)
+
+  IF (NOT MCP_BUG58158)
+    IF(WITH_EMBEDDED_SERVER)
+      # Kludge libndbclient into variable used when creating libmysqld
+      SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS}
+	ndbclient CACHE INTERNAL "" FORCE)
+    ENDIF()
+  ENDIF()
 ENDIF()

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20101112092939-hyai5i4g8ktl2ruy.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4003) Magnus Blåudd12 Nov