From: Tor Didriksen
Date: October 8 2012 8:18am
Subject: bzr push into mysql-trunk branch (tor.didriksen:4645 to 4646)
List-Archive: http://lists.mysql.com/commits/144984
Message-Id: <20121008081848.25154.54374.4646@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4646 Tor Didriksen	2012-10-08 [merge]
      merge 5.6 => trunk

    modified:
      cmake/os/Darwin.cmake
      cmake/os/SunOS.cmake
 4645 Sunny Bains	2012-10-08
      Remove file that should not be in the repository.

    removed:
      mysql-test/suite/innodb/t/innodb-wl6445-1.test.moved
=== modified file 'cmake/os/Darwin.cmake'
--- a/cmake/os/Darwin.cmake	2011-06-30 15:46:53 +0000
+++ b/cmake/os/Darwin.cmake	2012-10-08 08:16:12 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2010 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2010, 2011, 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
@@ -33,3 +32,8 @@ IF(CMAKE_OSX_DEPLOYMENT_TARGET)
     ADD_DEFINITIONS(-fno-common)
   ENDIF()
 ENDIF()
+
+# This is used for the version_compile_machine variable.
+IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+  SET(MYSQL_MACHINE_TYPE "x86_64")
+ENDIF()

=== modified file 'cmake/os/SunOS.cmake'
--- a/cmake/os/SunOS.cmake	2011-06-30 15:46:53 +0000
+++ b/cmake/os/SunOS.cmake	2012-10-08 08:16:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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
@@ -93,3 +93,8 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZ
     ENDIF()
   ENDIF()
 ENDIF()
+
+# This is used for the version_compile_machine variable.
+IF(CMAKE_SIZEOF_VOID_P MATCHES 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+  SET(MYSQL_MACHINE_TYPE "x86_64")
+ENDIF()

No bundle (reason: useless for push emails).