Imported Upstream version 5.5.41

CMakeLists.txt

@@ -28,10 +28,12 @@ ENDIF()
 
 # We use the LOCATION target property (CMP0026)
 # and get_target_property() for non-existent targets (CMP0045)
+# and INSTALL_NAME_DIR (CMP0042)
 IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
    CMAKE_VERSION VERSION_GREATER "3.0.0")
  CMAKE_POLICY(SET CMP0026 OLD)
  CMAKE_POLICY(SET CMP0045 OLD)
+ CMAKE_POLICY(SET CMP0042 OLD)
 ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
@@ -108,36 +110,15 @@ FOREACH(_base
 ENDFOREACH()
 
 
-
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
 IF(DEFINED ENV{CPPFLAGS})
   ADD_DEFINITIONS($ENV{CPPFLAGS})
 ENDIF()
 
-#
-# Control aspects of the development environment which are
-# specific to MySQL maintainers and developers.
-#
-INCLUDE(maintainer)
-
 SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.")
 MARK_AS_ADVANCED(MYSQL_MAINTAINER_MODE)
 
-# Whether the maintainer mode compiler options should be enabled.
-IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
-  SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
-ENDIF()
-IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-  SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
-ENDIF()
-IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-  SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS()
-ENDIF()
-IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-  SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
-ENDIF()
-
 # Packaging
 IF (NOT CPACK_GENERATOR)
   IF(WIN32)
@@ -183,7 +164,7 @@ OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 
 OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
- 
+
 include(CheckCSourceCompiles)
 include(CheckCXXSourceCompiles)
 # We need some extra FAIL_REGEX patterns
@@ -374,13 +355,7 @@ CHECK_JEMALLOC()
 # not run with the warning options as to not perturb fragile checks
 # (i.e. do not make warnings into errors).
 #
-IF(MYSQL_MAINTAINER_MODE MATCHES "ON")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
-ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_MAINTAINER_C_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MY_MAINTAINER_CXX_WARNINGS}")
-ENDIF()
+INCLUDE(maintainer)
 
 IF(WITH_UNIT_TESTS)
  ENABLE_TESTING()
@@ -479,8 +454,11 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
 
 INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                       COMPONENT Readme)
-INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
-                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
+
+# MDEV-6526 these files are not installed anymore
+#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+#                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
+
 IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 ENDIF()
@@ -491,4 +469,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
   MESSAGE(WARNING "
 You have linked MariaDB with GPLv3 libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.")
 ENDIF()
-

Docs/INFO_SRC

-revision-id: sergii@pisem.net-20140803113854-ku86z409wqigl8s6
-date: 2014-08-03 13:38:54 +0200
-build-date: 2014-08-03 14:00:45 +0200
-revno: 4264
+revision-id: sergii@pisem.net-20141219104403-wo7bvoif9zii3ie5
+date: 2014-12-19 11:44:03 +0100
+build-date: 2014-12-19 11:57:35 +0100
+revno: 4393
 branch-nick: 5.5
 
 
-MySQL source 5.5.39
+MySQL source 5.5.41

VERSION

 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=39
+MYSQL_VERSION_PATCH=41
 MYSQL_VERSION_EXTRA=

client/mysql.cc

@@ -89,7 +89,7 @@ extern "C" {
 #if defined(__WIN__)
 #include <conio.h>
 #else
-#include <readline/readline.h>
+#include <readline.h>
 #define HAVE_READLINE
 #define USE_POPEN
 #endif
@@ -1294,6 +1294,16 @@ int main(int argc,char *argv[])
 
 sig_handler mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&

client/mysqlbinlog.cc

 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2013, Monty Program Ab.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates.
+   Copyright (c) 2009, 2014, MariaDB
 
    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
@@ -2413,6 +2413,7 @@ int main(int argc, char** argv)
   DBUG_PROCESS(argv[0]);
 
   my_init_time(); // for time functions
+  tzset(); // set tzname
 
   init_alloc_root(&s_mem_root, 16384, 0);
   if (load_defaults("my", load_groups, &argc, &argv))

client/mysqltest.cc

@@ -5883,6 +5883,7 @@ void do_connect(struct st_command *command)
 {
   int con_port= opt_port;
   char *con_options;
+  char *ssl_cipher= 0;
   my_bool con_ssl= 0, con_compress= 0;
   my_bool con_pipe= 0;
   my_bool con_shm __attribute__ ((unused))= 0;
@@ -5971,6 +5972,11 @@ void do_connect(struct st_command *command)
     length= (size_t) (end - con_options);
     if (length == 3 && !strncmp(con_options, "SSL", 3))
       con_ssl= 1;
+    else if (!strncmp(con_options, "SSL-CIPHER=", 11))
+    {
+      con_ssl= 1;
+      ssl_cipher=con_options + 11;
+    }
     else if (length == 8 && !strncmp(con_options, "COMPRESS", 8))
       con_compress= 1;
     else if (length == 4 && !strncmp(con_options, "PIPE", 4))
@@ -6027,7 +6033,7 @@ void do_connect(struct st_command *command)
   {
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
     mysql_ssl_set(con_slot->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
-		  opt_ssl_capath, opt_ssl_cipher);
+		  opt_ssl_capath, ssl_cipher ? ssl_cipher : opt_ssl_cipher);
 #if MYSQL_VERSION_ID >= 50000
     /* Turn on ssl_verify_server_cert only if host is "localhost" */
     opt_ssl_verify_server_cert= !strcmp(ds_host.str, "localhost");

cmake/build_configurations/mysql_release.cmake

@@ -121,14 +121,9 @@ ENDIF()
 
 IF(UNIX)
   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
-  IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
-    OPTION(WITH_READLINE  "" ON)
-  ELSE()
-    OPTION(WITH_LIBEDIT  "" ON)
-  ENDIF()
-
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    SET(WITH_JEMALLOC "static" CACHE STRING "")
 
     IF(NOT IGNORE_AIO_CHECK)
       # Ensure aio is available on Linux (required by InnoDB)
@@ -206,15 +201,16 @@ IF(UNIX)
     ENDIF()
   ENDIF()
 
-  # OSX flags
-  IF(APPLE)
-    SET(COMMON_C_FLAGS                 "-g -fno-common -fno-strict-aliasing")
-    # XXX: why are we using -felide-constructors on OSX?
-    SET(COMMON_CXX_FLAGS               "-g -fno-common -felide-constructors -fno-strict-aliasing")
-    SET(CMAKE_C_FLAGS_DEBUG            "-O ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-O ${COMMON_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-Os ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
+  # Default Clang flags
+  IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+  ENDIF()
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
 
   # Solaris flags

cmake/compile_flags.cmake

+# Copyright (c) 2014, 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
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+
+## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
+MACRO(ADD_COMPILE_FLAGS)
+  SET(FILES "")
+  SET(FLAGS "")
+  SET(COMPILE_FLAGS)
+  FOREACH(ARG ${ARGV})
+    IF(ARG STREQUAL "COMPILE_FLAGS")
+      SET(COMPILE_FLAGS "COMPILE_FLAGS")
+    ELSEIF(COMPILE_FLAGS)
+      LIST(APPEND FLAGS ${ARG})
+    ELSE()
+      LIST(APPEND FILES ${ARG})
+    ENDIF()
+  ENDFOREACH()
+  FOREACH(FILE ${FILES})
+    FOREACH(FLAG ${FLAGS})
+      GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS)
+      IF(NOT PROP)
+        SET(PROP ${FLAG})
+      ELSE()
+        SET(PROP "${PROP} ${FLAG}")
+      ENDIF()
+      SET_SOURCE_FILES_PROPERTIES(
+        ${FILE} PROPERTIES COMPILE_FLAGS "${PROP}"
+        )
+    ENDFOREACH()
+  ENDFOREACH()
+ENDMACRO()

cmake/cpack_rpm.cmake

@@ -182,7 +182,7 @@ IF(RPM MATCHES "(rhel|centos)5")
 ELSEIF(RPM MATCHES "(rhel|centos)6")
   ALTERNATIVE_NAME("client" "mysql")
   ALTERNATIVE_NAME("shared" "mysql-libs")
-ELSEIF(RPM MATCHES "fedora")
+ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
   SET(epoch 1) # this is fedora
   ALTERNATIVE_NAME("client" "mariadb")
   ALTERNATIVE_NAME("client" "mysql")

cmake/install_layout.cmake

@@ -102,16 +102,6 @@ IF(UNIX)
   ENDIF()
 ENDIF()
 
-#
-# plugin_tests's value should not be used by imported plugins,
-# just use if(INSTALL_PLUGINTESTDIR).
-# The plugin must set its own install path for tests
-#
-FILE(GLOB plugin_tests
-  ${CMAKE_SOURCE_DIR}/plugin/*/tests
-  ${CMAKE_SOURCE_DIR}/internal/plugin/*/tests
-)
-
 #
 # STANDALONE layout
 #
@@ -136,7 +126,6 @@ SET(INSTALL_SQLBENCHDIR_STANDALONE      ".")
 SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
-SET(INSTALL_PLUGINTESTDIR_STANDALONE    ${plugin_tests})
 
 SET(INSTALL_UNIX_ADDRDIR_STANDALONE     "/tmp/mysql.sock")
 #
@@ -170,7 +159,6 @@ SET(INSTALL_SQLBENCHDIR_RPM             "")
 SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
 #
 SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
-SET(INSTALL_PLUGINTESTDIR_RPM           ${plugin_tests})
 
 SET(INSTALL_UNIX_ADDRDIR_RPM            "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock")
 
@@ -199,7 +187,6 @@ SET(INSTALL_SQLBENCHDIR_DEB             ".")
 SET(INSTALL_SUPPORTFILESDIR_DEB         "share/mysql")
 #
 SET(INSTALL_MYSQLDATADIR_DEB            "/var/lib/mysql")
-SET(INSTALL_PLUGINTESTDIR_DEB           ${plugin_tests})
 
 SET(INSTALL_UNIX_ADDRDIR_DEB            "/var/run/mysqld/mysqld.sock")
 #
@@ -226,7 +213,6 @@ SET(INSTALL_SQLBENCHDIR_SVR4            ".")
 SET(INSTALL_SUPPORTFILESDIR_SVR4        "support-files")
 #
 SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
-SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
 
 SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
 
@@ -242,7 +228,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
 # will be defined  as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
 # layout is chosen)
 FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN SYSCONF SYSCONF2
-    INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST UNIX_ADDR)
+    INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA UNIX_ADDR)
   SET(INSTALL_${var}DIR  ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
   CACHE STRING "${var} installation directory" ${FORCE})
   MARK_AS_ADVANCED(INSTALL_${var}DIR)

cmake/jemalloc.cmake

-# old cmake does not have ExternalProject file
-IF(CMAKE_VERSION VERSION_LESS "2.8.6")
-  MACRO (CHECK_JEMALLOC)
-  ENDMACRO()
-  RETURN()
-ENDIF()
+INCLUDE (CheckLibraryExists)
 
-INCLUDE(ExternalProject)
+SET(WITH_JEMALLOC auto CACHE STRING
+  "Build with jemalloc (possible values are 'yes', 'no', 'auto')")
 
-MACRO (USE_BUNDLED_JEMALLOC)
-  SET(SOURCE_DIR "${CMAKE_SOURCE_DIR}/extra/jemalloc")
-  SET(BINARY_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/extra/jemalloc/build")
-  SET(LIBJEMALLOC "libjemalloc")
-  SET(JEMALLOC_CONFIGURE_OPTS "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" "--with-private-namespace=jemalloc_internal_" "--enable-cc-silence")
-  IF (CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT APPLE) # see the comment in CMakeLists.txt
-    LIST(APPEND JEMALLOC_CONFIGURE_OPTS --enable-debug)
+MACRO (CHECK_JEMALLOC)
+  # compatibility with old WITH_JEMALLOC values
+  IF(WITH_JEMALLOC STREQUAL "bundled")
+    MESSAGE(FATAL_ERROR "MariaDB no longer bundles jemalloc")
   ENDIF()
-  
-  IF(CMAKE_GENERATOR MATCHES "Makefiles")
-    SET(MAKE_COMMAND ${CMAKE_MAKE_PROGRAM})
-  ELSE() # Xcode/Ninja generators
-    SET(MAKE_COMMAND make)
+  IF(WITH_JEMALLOC STREQUAL "system")
+    SET(WITH_JEMALLOC "yes")
   ENDIF()
-  
-  ExternalProject_Add(jemalloc
-    PREFIX extra/jemalloc
-    SOURCE_DIR ${SOURCE_DIR}
-    BINARY_DIR ${BINARY_DIR}
-    STAMP_DIR  ${BINARY_DIR}
-    CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS}
-    BUILD_COMMAND  ${MAKE_COMMAND} "build_lib_static"
-    INSTALL_COMMAND ""
-  )
-  ADD_LIBRARY(libjemalloc STATIC IMPORTED)
-  SET_TARGET_PROPERTIES(libjemalloc PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc_pic.a")
-  ADD_DEPENDENCIES(libjemalloc jemalloc)
-ENDMACRO()
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR APPLE)
- # Linux and OSX are the only systems where bundled jemalloc can be built without problems, 
- # as they both have GNU make and jemalloc actually compiles.
- # Also, BSDs use jemalloc as malloc already
- SET(WITH_JEMALLOC_DEFAULT "yes")
-ELSE()
- SET(WITH_JEMALLOC_DEFAULT "no")
-ENDIF()
+  IF(WITH_JEMALLOC STREQUAL "yes" OR WITH_JEMALLOC STREQUAL "auto" OR
+      WITH_JEMALLOC STREQUAL "static")
+
+    IF(WITH_JEMALLOC STREQUAL "static")
+      SET(libname jemalloc_pic)
+      SET(CMAKE_REQUIRED_LIBRARIES pthread dl m)
+    ELSE()
+      SET(libname jemalloc)
+    ENDIF()
 
-SET(WITH_JEMALLOC ${WITH_JEMALLOC_DEFAULT} CACHE STRING
-    "Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
+    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
+    SET(CMAKE_REQUIRED_LIBRARIES)
 
-MACRO (CHECK_JEMALLOC)
-  IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC jemalloc)
-    ELSEIF (WITH_JEMALLOC STREQUAL "system")
-      MESSAGE(FATAL_ERROR "system jemalloc is not found")
-    ELSEIF (WITH_JEMALLOC STREQUAL "yes")
-      SET(trybundled 1)
+      SET(LIBJEMALLOC ${libname})
+    ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
+      MESSAGE(FATAL_ERROR "${libname} is not found")
     ENDIF()
   ENDIF()
-  IF(WITH_JEMALLOC STREQUAL "bundled" OR trybundled)
-    USE_BUNDLED_JEMALLOC()
-  ENDIF()
 ENDMACRO()

cmake/maintainer.cmake

-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -13,51 +13,46 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-INCLUDE(CheckCCompilerFlag)
-
-# Setup GCC (GNU C compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS
-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing")
-
-  CHECK_C_COMPILER_FLAG("-Wno-missing-field-initializers"
-    HAVE_NO_MISSING_FIELD_INITIALIZERS)
-
-  IF (HAVE_NO_MISSING_FIELD_INITIALIZERS)
-    SET(MY_MAINTAINER_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} -Wno-missing-field-initializers")
-  ENDIF()
-
-  CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
-                        HAVE_DECLARATION_AFTER_STATEMENT)
-  IF(HAVE_DECLARATION_AFTER_STATEMENT)
-    SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
-        "-Wdeclaration-after-statement")
-  ENDIF()
-  SET(MY_MAINTAINER_C_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
-      CACHE INTERNAL "C warning options used in maintainer builds.")
-  # Do not make warnings in checks into errors.
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
-ENDMACRO()
-
-# Setup G++ (GNU C++ compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual"
-      CACHE INTERNAL "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICC (Intel C Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS "-Wcheck")
-  SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-    CACHE INTERNAL "C warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICPC (Intel C++ Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-    CACHE INTERNAL "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
+# Common warning flags for GCC, G++, Clang and Clang++
+SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
+MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
+IF(HAVE_WVLA)
+  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
+ENDIF()
+
+# Common warning flags for GCC and Clang
+SET(MY_C_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")
+
+# Common warning flags for G++ and Clang++
+SET(MY_CXX_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
+
+# Extra warning flags for Clang++
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_CXX_WARNING_FLAGS
+      "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+
+# Turn on Werror (warning => error) when using maintainer mode.
+IF(MYSQL_MAINTAINER_MODE MATCHES "ON")
+  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+ENDIF()
+
+# Set warning flags for GCC/Clang
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  SET(MY_MAINTAINER_C_WARNINGS "${MY_C_WARNING_FLAGS}")
+ENDIF()
+# Set warning flags for G++/Clang++
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_MAINTAINER_CXX_WARNINGS "${MY_CXX_WARNING_FLAGS}")
+ENDIF()
+
+IF(MYSQL_MAINTAINER_MODE MATCHES "ON")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
+ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MY_MAINTAINER_C_WARNINGS}")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MY_MAINTAINER_CXX_WARNINGS}")
+ENDIF()

cmake/os/Darwin.cmake

-# Copyright (c) 2010 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2010, 2014, 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
@@ -15,21 +14,3 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # This file includes OSX specific options and quirks, related to system checks
-
-# Workaround for CMake bug#9051
-# (CMake does not pass CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET when 
-# running TRY_COMPILE)
-
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT})
-ENDIF()
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSX_DEPLOYMENT_TARGET})
-ENDIF()
-
-IF(CMAKE_OSX_DEPLOYMENT_TARGET)
-  # Workaround linker problems  on OSX 10.4
-  IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.5")
-    ADD_DEFINITIONS(-fno-common)
-  ENDIF()
-ENDIF()

cmake/os/WindowsCache.cmake

-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -90,7 +90,7 @@ SET(HAVE_GETRLIMIT CACHE  INTERNAL "")
 SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
 SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
 SET(HAVE_GETWD CACHE  INTERNAL "")
-SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_GRP_H CACHE  INTERNAL "")
 SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
 SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
@@ -111,7 +111,7 @@ SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
-SET(HAVE_LOCALTIME_R CACHE  INTERNAL "")
+SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
 SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")

cmake/plugin.cmake

@@ -65,7 +65,7 @@ MACRO(MYSQL_ADD_PLUGIN)
   ENDIF()
   
   IF(WITH_${plugin}_STORAGE_ENGINE 
-    OR WITH_{$plugin}
+    OR WITH_${plugin}
     OR WITH_ALL 
     OR WITH_MAX 
     AND NOT WITHOUT_${plugin}_STORAGE_ENGINE

cmake/readline.cmake

@@ -116,24 +116,23 @@ ENDMACRO()
 MACRO (MYSQL_USE_BUNDLED_READLINE)
   SET(USE_NEW_READLINE_INTERFACE 1)
   SET(HAVE_HIST_ENTRY 0 CACHE INTERNAL "" FORCE)
-  SET(READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils)
-  SET(READLINE_LIBRARY readline)
+  SET(MY_READLINE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/cmd-line-utils/readline)
+  SET(MY_READLINE_LIBRARY readline)
   ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/cmd-line-utils/readline)
 ENDMACRO()
 
 MACRO (MYSQL_FIND_SYSTEM_READLINE)
   
-  FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h )
+  FIND_PATH(READLINE_INCLUDE_DIR readline.h PATH_SUFFIXES readline)
   FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
   MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
 
-  SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY} ${CURSES_LIBRARY})
-
   IF(READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
     SET(CMAKE_REQUIRED_LIBRARIES ${READLINE_LIBRARY} ${CURSES_LIBRARY})
+    SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h>
+    #include <readline.h>
     int main(int argc, char **argv)
     {
       rl_completion_func_t *func1= (rl_completion_func_t*)0;
@@ -141,19 +140,9 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
     }"
     NEW_READLINE_INTERFACE)
 
-    CHECK_CXX_SOURCE_COMPILES("
-    #include <stdio.h>
-    #include <readline/readline.h>
-    int main(int argc, char **argv)
-    {
-       HIST_ENTRY entry;
-       return 0;
-    }"
-    HAVE_HIST_ENTRY)
-    
     CHECK_C_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h>
+    #include <readline.h>
     #if RL_VERSION_MAJOR > 5
     #error
     #endif
@@ -176,30 +165,27 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
       ENDIF(READLINE_V5)
     ENDIF(NEW_READLINE_INTERFACE)
   ENDIF()
-  SET(CMAKE_REQUIRES_LIBRARIES )
 ENDMACRO()
 
 MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
-  
-  FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h )
-  FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-  MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
-
-  SET(CMAKE_REQUIRES_LIBRARIES ${READLINE_LIBRARY})
+  FIND_PATH(LIBEDIT_INCLUDE_DIR readline.h PATH_SUFFIXES editline edit/readline)
+  FIND_LIBRARY(LIBEDIT_LIBRARY edit)
+  MARK_AS_ADVANCED(LIBEDIT_INCLUDE_DIR LIBEDIT_LIBRARY)
 
-  IF(READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
+  IF(LIBEDIT_LIBRARY AND LIBEDIT_INCLUDE_DIR)
+    SET(CMAKE_REQUIRED_LIBRARIES ${LIBEDIT_LIBRARY})
+    SET(CMAKE_REQUIRED_INCLUDES ${LIBEDIT_INCLUDE_DIR})
     CHECK_CXX_SOURCE_COMPILES("
     #include <stdio.h>
-    #include <readline/readline.h>
+    #include <readline.h>
     int main(int argc, char **argv)
     {
-      char res= *(*rl_completion_entry_function)(0,0);
+      int res= (*rl_completion_entry_function)(0,0);
       completion_matches(0,0);
     }"
     LIBEDIT_INTERFACE)
     SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
   ENDIF()
-  SET(CMAKE_REQUIRES_LIBRARIES)
 ENDMACRO()
 
 
@@ -216,15 +202,33 @@ MACRO (MYSQL_CHECK_READLINE)
       IF (NOT APPLE)
         MYSQL_FIND_SYSTEM_READLINE()
       ENDIF()
-      IF(NOT USE_NEW_READLINE_INTERFACE)
+      IF(USE_NEW_READLINE_INTERFACE)
+        SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
+        SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY})
+      ELSE()
         MYSQL_FIND_SYSTEM_LIBEDIT()
-        IF(NOT USE_LIBEDIT_INTERFACE)
+        IF(USE_LIBEDIT_INTERFACE)
+          SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR})
+          SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY})
+        ELSE()
           MYSQL_USE_BUNDLED_READLINE()
         ENDIF()
       ENDIF()
     ENDIF()
-    SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
-    SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY})
+
+    SET(CMAKE_REQUIRED_LIBRARIES ${MY_READLINE_LIBRARY})
+    SET(CMAKE_REQUIRED_INCLUDES ${MY_READLINE_INCLUDE_DIR})
+    CHECK_CXX_SOURCE_COMPILES("
+    #include <stdio.h>
+    #include <readline.h>
+    int main(int argc, char **argv)
+    {
+       HIST_ENTRY entry;
+       return 0;
+    }"
+    HAVE_HIST_ENTRY)
+    SET(CMAKE_REQUIRED_LIBRARIES)
+    SET(CMAKE_REQUIRED_INCLUDES)
   ENDIF(NOT WIN32)
 ENDMACRO()
 

cmd-line-utils/readline/CMakeLists.txt

@@ -13,8 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
-                    ${CMAKE_SOURCE_DIR}/cmd-line-utils)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNO_KILL_INTR)
 

cmd-line-utils/readline/history.h

@@ -32,8 +32,8 @@ extern "C" {
 #  include "rlstdc.h"
 #  include "rltypedefs.h"
 #else
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
+#  include <rlstdc.h>
+#  include <rltypedefs.h>
 #endif
 
 #ifdef __STDC__

cmd-line-utils/readline/keymaps.h

@@ -32,9 +32,9 @@ extern "C" {
 #  include "chardefs.h"
 #  include "rltypedefs.h"
 #else
-#  include <readline/rlstdc.h>
-#  include <readline/chardefs.h>
-#  include <readline/rltypedefs.h>
+#  include <rlstdc.h>
+#  include <chardefs.h>
+#  include <rltypedefs.h>
 #endif
 
 /* A keymap contains one entry for each key in the ASCII set.

cmd-line-utils/readline/readline.h

@@ -33,10 +33,10 @@ extern "C" {
 #  include "keymaps.h"
 #  include "tilde.h"
 #else
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
-#  include <readline/keymaps.h>
-#  include <readline/tilde.h>
+#  include <rlstdc.h>
+#  include <rltypedefs.h>
+#  include <keymaps.h>
+#  include <tilde.h>
 #endif
 
 /* Hex-encoded Readline version number. */