bzr push into mysql-5.6 branch (tor.didriksen:4384 to 4385)

[Tor Didriksen]

 4385 Tor Didriksen	2012-10-03 [merge]
      merge 5.5 => 5.6

    modified:
      cmake/create_initial_db.cmake.in
      sql/CMakeLists.txt
 4384 Jon Olav Hauglid	2012-10-03 [merge]
      Merge from mysql-5.5 to mysql-5.6
      No conflicts

    modified:
      sql/ha_partition.cc
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2012-09-18 10:47:26 +0000
+++ b/cmake/create_initial_db.cmake.in	2012-10-03 14:07:49 +0000
@@ -88,10 +88,13 @@ EXECUTE_PROCESS(
   COMMAND "@CMAKE_COMMAND@" -E echo Executing ${BOOTSTRAP_COMMAND}
 )
 EXECUTE_PROCESS (
-  COMMAND "@CMAKE_COMMAND@" -E echo input file bootstrap.sql, current directory ${CWD}
+  COMMAND "@CMAKE_COMMAND@" -E
+  echo input file bootstrap.sql, current directory ${CWD}
 )
 EXECUTE_PROCESS (  
-  COMMAND ${BOOTSTRAP_COMMAND}  INPUT_FILE bootstrap.sql OUTPUT_VARIABLE OUT
+  COMMAND ${BOOTSTRAP_COMMAND}
+  INPUT_FILE bootstrap.sql
+  OUTPUT_VARIABLE OUT
   ERROR_VARIABLE ERR
   RESULT_VARIABLE RESULT
  )
@@ -100,3 +103,6 @@ IF(NOT RESULT EQUAL 0)
   MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}")
 ENDIF()
  
+EXECUTE_PROCESS (  
+  COMMAND "@CMAKE_COMMAND@" -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
+)

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2012-09-19 15:44:29 +0000
+++ b/sql/CMakeLists.txt	2012-10-03 14:07:49 +0000
@@ -458,15 +458,17 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
      COMMAND ${CMAKE_COMMAND}
      ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_initial_db.cmake
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data
-     COMMAND  ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
      DEPENDS mysqld
   )
   ADD_CUSTOM_TARGET(initial_database  
     ALL
     DEPENDS  initdb.dep
   )
-  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data DESTINATION . 
-  COMPONENT DataFiles PATTERN "initdb.dep" EXCLUDE  PATTERN "bootstrap.sql" EXCLUDE)
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data
+    DESTINATION . 
+    COMPONENT DataFiles
+    PATTERN "initdb.dep" EXCLUDE
+    PATTERN "bootstrap.sql" EXCLUDE)
 ELSE()
   # Not windows or cross compiling, just install an empty directory
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)

No bundle (reason: useless for push emails).