bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3918 to 3919) Bug#14058643

[magnus.blaudd]

 3919 magnus.blaudd@stripped	2012-05-11
      BUG#14058643 SVR4 PACKAGES OF CLUSTER MAY GROW ABOVE 2GB LIMIT AND FAIL TO
      BUILD
       - Add MCP patch for problem with too big SVR4 packages

    modified:
      libmysqld/examples/CMakeLists.txt
 3918 magnus.blaudd@stripped	2012-05-10
      ndb
       - remove mystery removal of IF(WITH_NDB_TEST) from CMakeLists.txt

    modified:
      storage/ndb/test/CMakeLists.txt
=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2012-03-30 06:33:44 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2012-05-11 07:45:36 +0000
@@ -31,6 +31,18 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY})
 ENDIF(UNIX)
 
+#ifndef MCP_BUG14058643
+IF(INSTALL_LAYOUT MATCHES "SVR4")
+  SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+  # The mysqltest_embedded and mysql_client_test_embedded are big, and at
+  # present may cause the Solaris SVR4 packages to be too big (>2GB) for
+  # the packaging tools to handle.
+  # Since these binaries are only used for testing the embedded server 
+  # they can safely be excluded from the build.
+  RETURN()
+ENDIF()
+#endif
+
 MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
 TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
 

No bundle (reason: useless for push emails).