bzr push into mysql-5.5 branch (tor.didriksen:4003 to 4004) Bug#13713525

[Tor Didriksen]

 4004 Tor Didriksen	2012-10-03
      Bug#13713525 CREATE_INITIAL_DB.CMAKE IS FAILING ON WINDOWS, STILL "DEVENV" RETURNS 0
      
      This bug depends on cmake version.
      
      For cmake 2.6 (which is still in use for some pushbuild trees)
      the main build would succeed, even if create_initial_db failed.
      
      The problem was the chaining of commands in the CUSTOM_COMMAND
      to produce 'initdb.dep'. It first invokes cmake to run mysqld,
      then invokes 'touch' to create the file. Moving the 'touch'
      command makes the error propagate properly for both cmake 2.6 and 2.8

    modified:
      cmake/create_initial_db.cmake.in
      sql/CMakeLists.txt
 4003 Jon Olav Hauglid	2012-10-03
      Bug#14495351: CRASH IN HA_PARTITION::HANDLE_UNORDERED_NEXT
      
      Follow-up patch - Fix broken build:
      error: format ‘%u’ expects argument of type ‘unsigned int’,
      but argument 2 has type ‘key_part_map {aka long unsigned int}’
      [-Werror=format]

    modified:
      sql/ha_partition.cc
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2011-06-30 15:46:53 +0000
+++ b/cmake/create_initial_db.cmake.in	2012-10-03 14:05:07 +0000
@@ -69,10 +69,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
  )
@@ -81,3 +84,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-05-29 08:54:57 +0000
+++ b/sql/CMakeLists.txt	2012-10-03 14:05:07 +0000
@@ -291,15 +291,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).