bzr push into mysql-5.5-bugteam branch (jonathan.perkin:3168 to 3169) Bug#58766

[Jonathan Perkin]

 3169 Jonathan Perkin	2010-12-07
      bug#58766: Server binary was compiled without fast-mutexes
      
      Re-enable fast mutexes on Linux for release builds.

    modified:
      cmake/build_configurations/mysql_release.cmake
 3168 Alfranio Correia	2010-12-06
      Post-push fix for BUG#57275.

    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2010-11-22 10:35:48 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2010-12-07 11:40:38 +0000
@@ -117,8 +117,8 @@ IF(UNIX)
 
   OPTION(WITH_PIC "" ON) # Why?
 
-  # Ensure aio is available on Linux (required by InnoDB)
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # Ensure aio is available on Linux (required by InnoDB)
     CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
     CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
     IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
@@ -130,6 +130,9 @@ IF(UNIX)
         SuSE:                       zypper install libaio-devel
        ")
     ENDIF()
+
+    # Enable fast mutexes on Linux
+    OPTION(WITH_FAST_MUTEXES "" ON)
   ENDIF()
 
 ENDIF()


Attachment: [text/bzr-bundle] bzr/[e-mail]