Merge 10.0 -> 10.1

5 files changed, 18 insertions, 11 deletions

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 368946a387b..85ec0480a40 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -155,9 +155,6 @@ IF(UNIX)
       # libmysqld.so will depend on libaio.so
       #SET(LIBMYSQLD_SO_EXTRA_LIBS aio)
     ENDIF()
-
-    # Enable fast mutexes on Linux
-    OPTION(WITH_FAST_MUTEXES "" ON)
   ENDIF()
 
 ENDIF()
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 03c6a03a3ed..30924120526 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -147,6 +147,10 @@ SETA(CPACK_RPM_test_PACKAGE_OBSOLETES
 SETA(CPACK_RPM_test_PACKAGE_PROVIDES
   "MySQL-test")
 
+SETA(CPACK_RPM_server_PACKAGE_REQUIRES 
+   ${CPACK_RPM_PACKAGE_REQUIRES}
+   "MariaDB-client")
+
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
 SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
 SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)
@@ -166,13 +170,13 @@ MACRO(ALTERNATIVE_NAME real alt)
   SET(${o} "${${o}} ${alt} ${alt}%{_isa}")
 ENDMACRO(ALTERNATIVE_NAME)
 
-# Argh! Different distributions call packages differently, to be a drop-in
-# replacement we have to fake distribution-speficic dependencies
-
 ALTERNATIVE_NAME("devel"  "mysql-devel")
 ALTERNATIVE_NAME("server" "mysql-server")
 ALTERNATIVE_NAME("test"   "mysql-test")
 
+# Argh! Different distributions call packages differently, to be a drop-in
+# replacement we have to fake distribution-speficic dependencies
+
 IF(RPM MATCHES "(rhel|centos)5")
   ALTERNATIVE_NAME("shared" "mysql")
 ELSEIF(RPM MATCHES "(rhel|centos)6")
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index 7feba109296..ee345b177bd 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -60,7 +60,11 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
     IF(NOT comp)
       SET(comp Debuginfo_archive_only) # not in MSI
     ENDIF()
-    INSTALL(FILES ${pdb_location} DESTINATION ${ARG_INSTALL_LOCATION} COMPONENT ${comp})
+	IF(type MATCHES "STATIC")
+	  # PDB for static libraries might be unsupported http://public.kitware.com/Bug/view.php?id=14600
+	  SET(opt OPTIONAL)
+	ENDIF()
+    INSTALL(FILES ${pdb_location} DESTINATION ${ARG_INSTALL_LOCATION} COMPONENT ${comp} ${opt})
   ENDFOREACH()
   ENDIF()
 ENDFUNCTION()
@@ -384,19 +388,21 @@ FUNCTION(INSTALL_MYSQL_TEST from to)
       DESTINATION "${INSTALL_MYSQLTESTDIR}/${to}"
       USE_SOURCE_PERMISSIONS
       COMPONENT Test
-      PATTERN "var/" EXCLUDE
+      PATTERN "var" EXCLUDE
       PATTERN "lib/My/SafeProcess" EXCLUDE
       PATTERN "lib/t*" EXCLUDE
       PATTERN "CPack" EXCLUDE
       PATTERN "CMake*" EXCLUDE
+      PATTERN "cmake_install.cmake" EXCLUDE
       PATTERN "mtr.out*" EXCLUDE
       PATTERN ".cvsignore" EXCLUDE
       PATTERN "*.am" EXCLUDE
       PATTERN "*.in" EXCLUDE
+      PATTERN "Makefile" EXCLUDE
       PATTERN "*.vcxproj" EXCLUDE
       PATTERN "*.vcxproj.filters" EXCLUDE
       PATTERN "*.vcxproj.user" EXCLUDE
-      PATTERN "CTest" EXCLUDE
+      PATTERN "CTest*" EXCLUDE
       PATTERN "*~" EXCLUDE
     )
   ENDIF()
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
index 2da701d39b0..8f85b988f8d 100644
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates.
 # 
 # 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
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 2abff3dc63d..f147f6ef2bf 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates.
 # 
 # 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