bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3903 to 3904)

[Bjorn Munch]

 3904 Bjorn Munch	2012-05-10
      Purge some embedded clients from SVR4 packages due to 2Gb lmit

    modified:
      libmysqld/examples/CMakeLists.txt
 3903 Mauritz Sundell	2012-04-26 {clone-mysql-5.5.22-ndb-7.2.6-src-build} [merge]
      merge 7.1 -> 7.2

    modified:
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
=== 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-10 07:21:22 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,30 +31,39 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql_embedded ${READLINE_LIBRARY})
 ENDIF(UNIX)
 
-MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
-TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
+#
+# The clients with embedded server are big, and at present may cause
+# the Solaris SVR4 packages to be too big (>2GB) for the packaging tools
+# to handle.  So, for now, we just disable it for those builds.
+# 
+IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
+  MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
+  TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
 
 
-IF(CMAKE_GENERATOR MATCHES "Xcode")
+  IF(CMAKE_GENERATOR MATCHES "Xcode")
 # It does not seem possible to tell Xcode the resulting target might need
 # to be linked with C++ runtime. The project needs to have at least one C++
 # file. Add a dummy one.
-  ADD_CUSTOM_COMMAND(OUTPUT  
-    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
-   COMMAND ${CMAKE_COMMAND} -E touch 
-    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
-  )
-  MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded
-    ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
-    ../../tests/mysql_client_test.c)
-ELSE()
-  MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
-  SET_TARGET_PROPERTIES(mysql_client_test_embedded  PROPERTIES HAS_CXX TRUE)
+    ADD_CUSTOM_COMMAND(OUTPUT  
+      ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+     COMMAND ${CMAKE_COMMAND} -E touch 
+      ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+    )
+    MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded
+      ${CMAKE_CURRENT_BINARY_DIR}/mysql_client_test_embedded_dummy.cc
+      ../../tests/mysql_client_test.c)
+  ELSE()
+    MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
+    SET_TARGET_PROPERTIES(mysql_client_test_embedded  PROPERTIES HAS_CXX TRUE)
+  ENDIF()
+  TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
 ENDIF()
-TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
 
 IF(UNIX)
-SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
-SET_TARGET_PROPERTIES(mysqltest_embedded PROPERTIES ENABLE_EXPORTS TRUE)
-SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+  SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+  IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
+    SET_TARGET_PROPERTIES(mysqltest_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+    SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+  ENDIF()
 ENDIF()

No bundle (reason: useless for push emails).