bzr push into mysql-trunk branch (Georgi.Kodinov:3876 to 3877) Bug#13859866

[Georgi Kodinov]

 3877 Georgi Kodinov	2012-04-17
      Bug #13859866: VERSION_COMPILE_MACHINE SHOWS X86 FOR 
      64-BIT BINARIES ON 64-BIT WINDOWS MACHINE
      
      Added a workaround for a cmake deficiency that caused 
      the problem.
      Now the mysql cmake files will set the compile_machine
      to x86_64 when compiling a 64 bit windows binary.

    modified:
      CMakeLists.txt
      cmake/os/Windows.cmake
      config.h.cmake
 3876 Andrei Elkin	2012-04-18
      BUG#13893310
      
      a push-push issue is fixed. 
      The path to slave info file was handled incorrectly to make the file slip deletion
      what PB2 diagnosed to catch Error 6 Error on delete on multiple rpl tests.
      
      Fixed with simplifying Rpl_info_file::do_reset_info() to use
      the well-formed file name argument instead of compose one with fn_format.

    modified:
      sql/rpl_info_file.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2012-04-02 14:31:07 +0000
+++ b/CMakeLists.txt	2012-04-17 14:20:00 +0000
@@ -103,6 +103,10 @@ IF(BUILD_CONFIG)
   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
 ENDIF()
 
+#cmake on 64 bit windows doesn't set CMAKE_SYSTEM_PROCESSOR correctly
+SET(MYSQL_MACHINE_TYPE ${CMAKE_SYSTEM_PROCESSOR})
+
+
 # Include the platform-specific file. To allow exceptions, this code
 # looks for files in order of how specific they are. If there is, for
 # example, a generic Linux.cmake and a version-specific

=== modified file 'cmake/os/Windows.cmake'
--- a/cmake/os/Windows.cmake	2011-10-17 10:28:01 +0000
+++ b/cmake/os/Windows.cmake	2012-04-17 14:20:00 +0000
@@ -40,6 +40,7 @@ INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmak
 # Used by the test suite to ignore bugs on some platforms, 
 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   SET(SYSTEM_TYPE "Win64")
+  SET(MYSQL_MACHINE_TYPE "x86_64")
 ELSE()
   SET(SYSTEM_TYPE "Win32")
 ENDIF()

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2012-03-01 09:17:31 +0000
+++ b/config.h.cmake	2012-04-17 14:20:00 +0000
@@ -489,7 +489,7 @@
 #cmakedefine STACK_DIRECTION @STACK_DIRECTION@
 
 #define SYSTEM_TYPE "@SYSTEM_TYPE@"
-#define MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@"
+#define MACHINE_TYPE "@MYSQL_MACHINE_TYPE@"
 #cmakedefine HAVE_DTRACE 1
 
 #cmakedefine SIGNAL_WITH_VIO_CLOSE 1

No bundle (reason: useless for push emails).