cmake: remove unused checks, options, and symbols

CMakeLists.txt

@@ -40,12 +40,6 @@ MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
-# Distinguish between community and non-community builds, with the
-# default being a community build. This does not impact the feature
-# set that will be compiled in; it's merely provided as a hint to
-# custom packaging steps.
-OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) 
-
 # Use a default manufacturer if no manufacturer was identified.
 IF(NOT DEFINED MANUFACTURER) 
   SET(MANUFACTURER "Built from Source" CACHE  STRING
@@ -170,13 +164,11 @@ IF(DISABLE_SHARED)
   SET(WITHOUT_DYNAMIC_PLUGINS 1)
 ENDIF()
 OPTION(ENABLED_PROFILING "Enable profiling" ON)
-OPTION(CYBOZU "" OFF)
 OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
 IF(UNIX)
   OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
 ENDIF()
 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON)
-MARK_AS_ADVANCED(CYBOZU)
 
 OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
 

cmake/readline.cmake

@@ -27,25 +27,11 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
       SET(HAVE_MBSTATE_T 1)
     ENDIF()
   ENDIF()
-
-  CHECK_C_SOURCE_COMPILES("
-  #include <langinfo.h>
-  int main(int ac, char **av)
-  {
-    char *cs = nl_langinfo(CODESET);
-    return 0;
-  }"
-  HAVE_LANGINFO_CODESET)
   
   CHECK_FUNCTION_EXISTS(mbrlen HAVE_MBRLEN)
-  CHECK_FUNCTION_EXISTS(mbscmp HAVE_MBSCMP)
   CHECK_FUNCTION_EXISTS(mbsrtowcs HAVE_MBSRTOWCS)
-  CHECK_FUNCTION_EXISTS(wcrtomb HAVE_WCRTOMB)
   CHECK_FUNCTION_EXISTS(mbrtowc HAVE_MBRTOWC)
-  CHECK_FUNCTION_EXISTS(wcscoll HAVE_WCSCOLL)
-  CHECK_FUNCTION_EXISTS(wcsdup HAVE_WCSDUP)
   CHECK_FUNCTION_EXISTS(wcwidth HAVE_WCWIDTH)
-  CHECK_FUNCTION_EXISTS(wctype HAVE_WCTYPE)
   CHECK_FUNCTION_EXISTS(iswlower HAVE_ISWLOWER)
   CHECK_FUNCTION_EXISTS(iswupper HAVE_ISWUPPER)
   CHECK_FUNCTION_EXISTS(towlower HAVE_TOWLOWER)
@@ -60,13 +46,7 @@ MACRO (MYSQL_CHECK_MULTIBYTE)
 
   SET(CMAKE_EXTRA_INCLUDE_FILES wctype.h)
   CHECK_TYPE_SIZE(wctype_t SIZEOF_WCTYPE_T)
-  IF(SIZEOF_WCTYPE_T)
-    SET(HAVE_WCTYPE_T 1)
-  ENDIF()
   CHECK_TYPE_SIZE(wint_t SIZEOF_WINT_T)
-  IF(SIZEOF_WINT_T)
-    SET(HAVE_WINT_T 1)
-  ENDIF()
   SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 ENDMACRO()
@@ -87,15 +67,12 @@ MACRO (FIND_CURSES)
 
  IF(CURSES_HAVE_CURSES_H)
    SET(HAVE_CURSES_H 1 CACHE INTERNAL "")
- ELSEIF(CURSES_HAVE_NCURSES_H)
-   SET(HAVE_NCURSES_H 1 CACHE INTERNAL "")
  ENDIF()
  IF(CMAKE_SYSTEM_NAME MATCHES "HP")
    # CMake uses full path to library /lib/libcurses.sl 
    # On Itanium, it results into architecture mismatch+
    # the library is for  PA-RISC
    SET(CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
-   SET(CURSES_CURSES_LIBRARY "curses" CACHE INTERNAL "" FORCE)
  ENDIF()
 
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")

include/my_context.h

@@ -62,7 +62,7 @@ struct my_context {
   ucontext_t base_context;
   ucontext_t spawned_context;
   int active;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF
@@ -79,7 +79,7 @@ struct my_context {
   uint64_t save[9];
   void *stack_top;
   void *stack_bot;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF
@@ -96,7 +96,7 @@ struct my_context {
   uint64_t save[7];
   void *stack_top;
   void *stack_bot;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   unsigned int valgrind_stack_id;
 #endif
 #ifndef DBUG_OFF

include/my_global.h

@@ -153,13 +153,11 @@
 */
 #if defined(__APPLE__) && defined(__MACH__)
 #  undef SIZEOF_CHARP 
-#  undef SIZEOF_SHORT 
 #  undef SIZEOF_INT 
 #  undef SIZEOF_LONG 
 #  undef SIZEOF_LONG_LONG 
 #  undef SIZEOF_OFF_T 
 #  undef WORDS_BIGENDIAN
-#  define SIZEOF_SHORT 2
 #  define SIZEOF_INT 4
 #  define SIZEOF_LONG_LONG 8
 #  define SIZEOF_OFF_T 8

include/my_valgrind.h

@@ -19,18 +19,18 @@
 #define IF_VALGRIND(A,B) B
 #endif
 
-#if defined(HAVE_VALGRIND) && defined(HAVE_valgrind)
+#if defined(HAVE_VALGRIND_MEMCHECK_H) && defined(HAVE_valgrind)
 # include <valgrind/memcheck.h>
 # define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
 # define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
 # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
-#else /* HAVE_VALGRIND */
+#else /* HAVE_VALGRIND_MEMCHECK_H */
 # define MEM_UNDEFINED(a,len) ((void) 0)
 # define MEM_NOACCESS(a,len) ((void) 0)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
-#endif /* HAVE_VALGRIND */
+#endif /* HAVE_VALGRIND_MEMCHECK_H */
 
 #ifndef DBUG_OFF
 #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); memset(A, C, trash_tmp); MEM_UNDEFINED(A, trash_tmp); } while (0)

include/mysql/psi/mysql_socket.h

@@ -1013,7 +1013,7 @@ inline_mysql_socket_accept
 #endif
   MYSQL_SOCKET socket_listen, struct sockaddr *addr, socklen_t *addr_len)
 {
-  int flags;
+  int flags __attribute__ ((unused));
 
   MYSQL_SOCKET socket_accept= MYSQL_INVALID_SOCKET;
   socklen_t addr_length= (addr_len != NULL) ? *addr_len : 0;

mysys/my_context.c

@@ -24,7 +24,7 @@
 #include "m_string.h"
 #include "my_context.h"
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/valgrind.h>
 #endif
 
@@ -134,7 +134,7 @@ my_context_init(struct my_context *c, size_t stack_size)
   if (!(c->stack= malloc(stack_size)))
     return -1;                                  /* Out of memory */
   c->stack_size= stack_size;
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size);
 #endif
@@ -146,7 +146,7 @@ my_context_destroy(struct my_context *c)
 {
   if (c->stack)
   {
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
     free(c->stack);
@@ -384,7 +384,7 @@ my_context_init(struct my_context *c, size_t stack_size)
     (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
   bzero(c->stack_top, 16);
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
 #endif
@@ -397,7 +397,7 @@ my_context_destroy(struct my_context *c)
   if (c->stack_bot)
   {
     free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
   }
@@ -620,7 +620,7 @@ my_context_init(struct my_context *c, size_t stack_size)
     (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16);
   bzero(c->stack_top, 16);
 
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
   c->valgrind_stack_id=
     VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
 #endif
@@ -633,7 +633,7 @@ my_context_destroy(struct my_context *c)
   if (c->stack_bot)
   {
     free(c->stack_bot);
-#ifdef HAVE_VALGRIND
+#ifdef HAVE_VALGRIND_MEMCHECK_H
     VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
 #endif
   }

sql/CMakeLists.txt

@@ -317,8 +317,7 @@ IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
   ENDIF()
 ENDIF()
 
-FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar 
- tar git)
+FOREACH(tool gtar tar git)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)

storage/innobase/CMakeLists.txt

@@ -83,6 +83,9 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG -DUNIV_SYNC_DEB
 #ENDIF()
 
 CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
+IF(HAVE_SCHED_GETCPU)
+  ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU)
+ENDIF()
 
 IF(NOT MSVC)
   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
@@ -240,11 +243,13 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+CHECK_CXX_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+IF(HAVE_C99_INITIALIZERS)
+  ADD_DEFINITIONS(-DHAVE_C99_INITIALIZERS)
+ENDIF()
 
 ENDIF(NOT MSVC)
 
-CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)
 CHECK_FUNCTION_EXISTS(vasprintf  HAVE_VASPRINTF)
 
 # Solaris atomics

storage/tokudb/CMakeLists.txt

@@ -30,15 +30,12 @@ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG)
 ############################################
 SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-10.2/README-TOKUDB\nusr/share/doc/mariadb-server-10.2/README.md" PARENT_SCOPE)
 SET(TOKUDB_VERSION "tokudb-7.5.7")
-SET(USE_BDB OFF CACHE BOOL "")
-MARK_AS_ADVANCED(BUILDNAME)
 MARK_AS_ADVANCED(BUILD_TESTING)
 MARK_AS_ADVANCED(CMAKE_TOKUDB_REVISION)
 MARK_AS_ADVANCED(LIBTOKUDB)
 MARK_AS_ADVANCED(LIBTOKUPORTABILITY)
 MARK_AS_ADVANCED(TOKUDB_DATA)
 MARK_AS_ADVANCED(TOKU_DEBUG_PARANOID)
-MARK_AS_ADVANCED(USE_BDB)
 MARK_AS_ADVANCED(USE_VALGRIND)
 MARK_AS_ADVANCED(XZ_SOURCE_DIR)
 ############################################

storage/tokudb/ft-index/CMakeLists.txt

@@ -33,7 +33,7 @@ endif()
 
 include(TokuFeatureDetection)
 include(TokuSetupCompiler)
-include(TokuSetupCTest)
+#include(TokuSetupCTest)
 include(TokuThirdParty)
 
 set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

storage/tokudb/ft-index/portability/toku_config.h.in

@@ -47,6 +47,10 @@
 #cmakedefine HAVE_O_DIRECT 1
 #cmakedefine HAVE_F_NOCACHE 1
 
+#cmakedefine HAVE_MAP_ANONYMOUS 1
+#cmakedefine HAVE_MINCORE 1
+#cmakedefine HAVE_PR_SET_PTRACER 1
+#cmakedefine HAVE_PR_SET_PTRACER_ANY 1
 #cmakedefine HAVE_MALLOC_SIZE 1
 #cmakedefine HAVE_MALLOC_USABLE_SIZE 1
 #cmakedefine HAVE_MEMALIGN 1

storage/xtradb/CMakeLists.txt

@@ -88,6 +88,9 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG -DUNIV_SYNC_DEB
 #ENDIF()
 
 CHECK_FUNCTION_EXISTS(sched_getcpu  HAVE_SCHED_GETCPU)
+IF(HAVE_SCHED_GETCPU)
+  ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU)
+ENDIF()
 
 IF(NOT MSVC)
   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
@@ -230,11 +233,13 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
   ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
 ENDIF()
 
-CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+CHECK_CXX_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+IF(HAVE_C99_INITIALIZERS)
+  ADD_DEFINITIONS(-DHAVE_C99_INITIALIZERS)
+ENDIF()
 
 ENDIF(NOT MSVC)
 
-CHECK_FUNCTION_EXISTS(asprintf  HAVE_ASPRINTF)
 CHECK_FUNCTION_EXISTS(vasprintf  HAVE_VASPRINTF)
 
 # Solaris atomics