bzr push into mysql-5.6 branch (tor.didriksen:4407 to 4408) Bug#14704503

[Tor Didriksen]

 4408 Tor Didriksen	2012-10-08
      Bug#14704503 BUILDS ON MAC OS X HAVE INCORRECT VERSION_COMPILE_MACHINE
      
      This is the same bug on intel/solaris and mac as
      Bug #13859866: VERSION_COMPILE_MACHINE SHOWS X86 FOR 
      64-BIT BINARIES ON 64-BIT WINDOWS MACHINE
      
      version_compile_machine will now show x86_64 for 64 bit binaries
      for intel/solaris and darwin.

    modified:
      cmake/os/Darwin.cmake
      cmake/os/SunOS.cmake
 4407 Sunny Bains	2012-10-08
      Bug #14723291 - FTS AUXILIARY CREATE TABLE IGNORES FILE PER TABLE SETTING
      
      The WL5980 changes changed the way srv_file_per_table is used, it was an
      improvement over previous usage. However, this introduces a bug because the
      FTS auxiliary tables are created using the internal SQL parser. We can't set
      any special flags or influence the setting from SQL. We have to use the global
      setting. The problem was that the AUX tables were being created in the System
      Tablespace. Additionally orphaned tables could be left in the system tablespace
      causing bloat and making it (close to) impossible to reclaim that space. This
      fix addresses both problems. Create the AUX tables in separate tablespaces if
      the srv_file_per_table flag is set and additionally checking for orphaned AUX
      tables and removing them.
      
      Several tests were fixed because they list files and the AUX files were
      showing up in the directory listing after this fix.
      
      rb://1370 Approved by Jimmy Yang.

    modified:
      internal/mysql-test/suite/i_innodb/r/innodb-bug-14676345.result
      internal/mysql-test/suite/i_innodb/t/innodb-bug-14676345.test
      internal/mysql-test/suite/i_innodb/t/innodb_bug14488218.test
      internal/mysql-test/suite/i_innodb/t/innodb_bug14503700.test
      internal/mysql-test/suite/i_innodb/t/innodb_bug14582403.test
      internal/mysql-test/suite/i_innodb/t/innodb_bug14584867.test
      mysql-test/suite/innodb/r/innodb-wl5980-alter.result
      mysql-test/suite/innodb/t/innodb-alter.test
      mysql-test/suite/innodb/t/innodb-wl5980-alter.test
      mysql-test/suite/innodb/t/innodb-wl6445-1.test
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/include/fil0fil.h
      storage/innobase/pars/pars0pars.cc
=== 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).