bzr push into mysql-5.6 branch (bjorn.munch:4223 to 4224)

[Bjorn Munch]

 4224 Bjorn Munch	2012-09-04
      Remove mysql_client_test_embedded from SVR4 builds

    modified:
      libmysqld/examples/CMakeLists.txt
 4223 Annamalai Gurusami	2012-09-03 {clone-5.6.7-rc-build}
      This test case also must mask the maximum row size because
      of the dependency with the page size.  

    modified:
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/t/innodb_4k.test
=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2012-07-10 08:08:57 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2012-09-04 08:44:17 +0000
@@ -61,12 +61,22 @@ IF(CMAKE_GENERATOR MATCHES "Xcode")
     ${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)
+#
+# SVR4 packaging has a hard limit of 2Gb at least on Solaris 10, so
+# remove the big mysql_client_test_embedded which is of little use
+#
+  IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
+    MYSQL_ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
+    SET_TARGET_PROPERTIES(mysql_client_test_embedded  PROPERTIES HAS_CXX TRUE)
+  ENDIF()
+ENDIF()
+IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
+  TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
 ENDIF()
-TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
 
 IF(UNIX)
 SET_TARGET_PROPERTIES(mysqltest_embedded PROPERTIES ENABLE_EXPORTS TRUE)
-SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+IF(NOT INSTALL_LAYOUT MATCHES "SVR4")
+  SET_TARGET_PROPERTIES(mysql_client_test_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+  ENDIF()
 ENDIF()

No bundle (reason: useless for push emails).