Merge branch '10.3' into 10.4

9 files changed, 25 insertions, 5 deletions

diff --git a/cmake/aws_sdk.cmake b/cmake/aws_sdk.cmake
index 7abd9974c1e..f6f88f2b880 100644
--- a/cmake/aws_sdk.cmake
+++ b/cmake/aws_sdk.cmake
@@ -45,6 +45,7 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON)
   IF(UNIX)
     # Check librairies required for building SDK
     FIND_PACKAGE(CURL)
+    SET_PACKAGE_PROPERTIES(CURL PROPERTIES TYPE REQUIRED)
     IF(NOT CURL_FOUND)
       SKIP_AWS_SDK("AWS C++ SDK requires libcurl development package")
     ENDIF()
@@ -54,10 +55,12 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON)
     ENDIF()
     IF(NOT APPLE)
       FIND_LIBRARY(UUID_LIBRARIES uuid)
+      SET_PACKAGE_PROPERTIES(UUID_LIBRARIES PROPERTIES TYPE REQUIRED)
       IF(NOT UUID_LIBRARIES)
         SKIP_AWS_SDK("AWS C++ SDK requires uuid development package")
       ENDIF()
       FIND_PACKAGE(OpenSSL)
+      SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE REQUIRED)
       IF(NOT OPENSSL_FOUND)
         SKIP_AWS_SDK("AWS C++ SDK requires openssl development package")
       ENDIF()
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake
index 2c2c965df64..27b1430f33e 100644
--- a/cmake/for_clients.cmake
+++ b/cmake/for_clients.cmake
@@ -21,7 +21,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
     FOREACH(lib ${${target}_LIB_DEPENDS})
       # Filter out "general", it is not a library, just CMake hint
       # Also, remove duplicates
-      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
+      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND NOT lib STREQUAL "zlib")
         IF (lib MATCHES "^\\-")
           SET(${var} "${${var}} ${lib} ") 
         ELSEIF(lib MATCHES "^/")
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index b94a880cf05..55369157689 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -37,5 +37,6 @@ MACRO (CHECK_JEMALLOC)
     IF (NOT LIBJEMALLOC AND NOT WITH_JEMALLOC STREQUAL "auto")
       MESSAGE(FATAL_ERROR "jemalloc is not found")
     ENDIF()
+    ADD_FEATURE_INFO(JEMALLOC LIBJEMALLOC "Use the JeMalloc memory allocator")
   ENDIF()
 ENDMACRO()
diff --git a/cmake/numa.cmake b/cmake/numa.cmake
index d24318634c3..0ccb560d378 100644
--- a/cmake/numa.cmake
+++ b/cmake/numa.cmake
@@ -33,6 +33,7 @@ MACRO (MYSQL_CHECK_NUMA)
       ENDIF()
     ENDIF()
 
+    ADD_FEATURE_INFO(NUMA HAVE_LIBNUMA "NUMA memory allocation policy")
     IF(WITH_NUMA_LOWERCASE STREQUAL "auto" AND HAVE_LIBNUMA)
       MESSAGE_ONCE(numa "WITH_NUMA=AUTO: NUMA memory allocation policy enabled")
     ELSEIF(WITH_NUMA_LOWERCASE STREQUAL "auto" AND NOT HAVE_LIBNUMA)
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 486f5b00590..ff911008939 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -49,7 +49,7 @@ MACRO(MYSQL_ADD_PLUGIN)
   LIST(REMOVE_AT SOURCES 0)
   STRING(TOUPPER ${plugin} plugin)
   STRING(TOLOWER ${plugin} target)
-  
+
   IF (ARG_MANDATORY)
     UNSET(PLUGIN_${plugin} CACHE)
     SET(PLUGIN_${plugin} "YES")
@@ -110,11 +110,11 @@ MACRO(MYSQL_ADD_PLUGIN)
     SET(with_var "WITH_${plugin}")
   ENDIF()
   UNSET(${with_var} CACHE)
-  
+
   IF(NOT ARG_DEPENDENCIES)
     SET(ARG_DEPENDENCIES)
   ENDIF()
-  
+
   IF(NOT ARG_MODULE_OUTPUT_NAME)
     IF(ARG_STORAGE_ENGINE)
       SET(ARG_MODULE_OUTPUT_NAME "ha_${target}")
@@ -256,6 +256,16 @@ MACRO(MYSQL_ADD_PLUGIN)
     INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/${subpath}")
   ENDIF()
 
+  GET_TARGET_PROPERTY(plugin_type ${target} TYPE)
+  STRING(REGEX REPLACE "_LIBRARY$" "" plugin_type ${plugin_type})
+  STRING(REGEX REPLACE "^NO$" "" plugin_type ${plugin_type})
+  IF(ARG_STORAGE_ENGINE)
+    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Storage Engine ${plugin_type}")
+  ELSEIF(ARG_CLIENT)
+    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Client plugin ${plugin_type}")
+  ELSE()
+    ADD_FEATURE_INFO(${plugin} PLUGIN_${plugin} "Server plugin ${plugin_type}")
+  ENDIF()
   ENDIF(NOT WITHOUT_SERVER OR ARG_CLIENT)
 ENDMACRO()
 
diff --git a/cmake/readline.cmake b/cmake/readline.cmake
index 69a51d8a156..c8bbc7fc259 100644
--- a/cmake/readline.cmake
+++ b/cmake/readline.cmake
@@ -52,7 +52,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
 ENDMACRO()
 
 MACRO (FIND_CURSES)
- FIND_PACKAGE(Curses) 
+ FIND_PACKAGE(Curses REQUIRED)
  MARK_AS_ADVANCED(CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H)
  IF(NOT CURSES_FOUND)
    SET(ERRORMSG "Curses library not found. Please install appropriate package,
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index 5f54d77752c..7c2488be8bd 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -117,6 +117,7 @@ MACRO (MYSQL_CHECK_SSL)
       ENDIF()
     ENDIF()
     FIND_PACKAGE(OpenSSL)
+    SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE RECOMMENDED)
     IF(OPENSSL_FOUND)
       SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
       INCLUDE(CheckSymbolExists)
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index e353004e7d2..978be0b9f98 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -65,5 +65,6 @@ MACRO(CHECK_SYSTEMD)
     ELSEIF(NOT WITH_SYSTEMD STREQUAL "no")
       MESSAGE(FATAL_ERROR "Invalid value for WITH_SYSTEMD. Must be 'yes', 'no', or 'auto'.")
     ENDIF()
+    ADD_FEATURE_INFO(SYSTEMD LIBSYSTEMD "Systemd scripts and notification support")
   ENDIF()
 ENDMACRO()
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index a6d843e5591..368ae61d1d3 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -64,4 +64,7 @@ Then restart the build.
   ADD_SUBDIRECTORY(wsrep-lib)
   SET(BUILD_SHARED_LIBS ${old_BUILD_SHARED_LIBS})
 ENDIF()
+IF (NOT WIN32)
+  ADD_FEATURE_INFO(WSREP WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)")
+ENDIF()
 ENDIF(NOT WITHOUT_SERVER)