Bug#17730320: REMOVE UNNEEDE CMAKE CHECKS AND #IFDEFS IN 5.7.4

Patch mysql#3. This patch removes the following:

HAVE_SETENV - always true
HAVE_DECL_SHM_HUGETLB - use HAVE_LARGE_PAGES instead
HUGETLB_USE_PROC_MEMINFO - use HAVE_LARGE_PAGES instead
HAVE_LARGE_PAGE_OPTION - use HAVE_LARGE_PAGES || HAVE_SOLARIS_LARGE_PAGES instead
HAVE_RWLOCK_T - never used
HAVE_DECL_MHA_MAPSIZE_CA - use HAVE_SOLARIS_LARGE_PAGES instead
HAVE_SYS_IPC_H - always true (where used)
HAVE_SYS_SHM_H - always true (where used)

Removed _MSC_VER checks where they are not relevant as we require Visual Studio 2010
(which has _MSC_VER = 1600). Also added CMake check which aborts configuration if
an older version of Visual Studio is used.

Removed HAVE_PREAD checks where they are not relevant. HAVE_PREAD is always true
for non-Windows supported platforms (POSIX).

Author: jhauglid

client/mysqltest.cc

@@ -60,6 +60,10 @@ using std::max;
 #define SIGNAL_FMT "signal %d"
 #endif
 
+#ifdef _WIN32
+#define setenv(a,b,c) _putenv_s(a,b)
+#endif
+
 #define MAX_VAR_NAME_LENGTH    256
 #define MAX_COLUMNS            256
 #define MAX_EMBEDDED_SERVER_ARGS 64
@@ -70,10 +74,6 @@ using std::max;
 #define QUERY_SEND_FLAG  1
 #define QUERY_REAP_FLAG  2
 
-#ifndef HAVE_SETENV
-static int setenv(const char *name, const char *value, int overwrite);
-#endif
-
 C_MODE_START
 static void signal_handler(int sig);
 static my_bool get_one_option(int optid, const struct my_option *,
@@ -10776,18 +10776,3 @@ void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING *ds_input)
   delete_dynamic(&lines);
   DBUG_VOID_RETURN;
 }
-
-#ifndef HAVE_SETENV
-static int setenv(const char *name, const char *value, int overwrite)
-{
-  size_t buflen= strlen(name) + strlen(value) + 2;
-  char *envvar= (char *)malloc(buflen);
-  if(!envvar)
-    return ENOMEM;
-  strcpy(envvar, name);
-  strcat(envvar, "=");
-  strcat(envvar, value);
-  putenv(envvar);
-  return 0;
-}
-#endif

cmake/os/Linux.cmake

@@ -41,9 +41,4 @@ ENDIF()
 SET(_FILE_OFFSET_BITS 64)
 
 # Linux specific HUGETLB /large page support
-CHECK_SYMBOL_EXISTS(SHM_HUGETLB sys/shm.h  HAVE_DECL_SHM_HUGETLB)
-IF(HAVE_DECL_SHM_HUGETLB)
-  SET(HAVE_LARGE_PAGES 1)
-  SET(HUGETLB_USE_PROC_MEMINFO 1)
-  SET(HAVE_LARGE_PAGE_OPTION 1)
-ENDIF()
+CHECK_SYMBOL_EXISTS(SHM_HUGETLB sys/shm.h HAVE_LINUX_LARGE_PAGES)

cmake/os/SunOS.cmake

@@ -20,9 +20,6 @@ INCLUDE(CheckCSourceCompiles)
 # Enable 64 bit file offsets
 SET(_FILE_OFFSET_BITS 64)
 
-# Legacy option, without it  my_pthread is having problems
-ADD_DEFINITIONS(-DHAVE_RWLOCK_T)
-
 # On  Solaris, use of intrinsics will screw the lib search logic
 # Force using -lm, so rint etc are found.
 SET(LIBM m)
@@ -32,12 +29,7 @@ SET(LIBM m)
 SET(CMAKE_THREADS_LIBS_INIT -lpthread CACHE INTERNAL "" FORCE)
 
 # Solaris specific large page support
-CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_DECL_MHA_MAPSIZE_VA)
-IF(HAVE_DECL_MHA_MAPSIZE_VA)
- SET(HAVE_SOLARIS_LARGE_PAGES 1)
- SET(HAVE_LARGE_PAGE_OPTION 1)
-ENDIF()
-
+CHECK_SYMBOL_EXISTS(MHA_MAPSIZE_VA sys/mman.h  HAVE_SOLARIS_LARGE_PAGES)
 
 # Solaris atomics
 CHECK_C_SOURCE_RUNS(

cmake/os/Windows.cmake

@@ -34,7 +34,11 @@ INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL)
 # a VC solution.
 GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${_SCRIPT_DIR}/WindowsCache.cmake)
- 
+
+# We require at least Visual Studio 2010 (aka 10.0) which has version nr 1600.
+IF(MSVC_VERSION LESS 1600)
+  MESSAGE(FATAL_ERROR "Visual Studio 2010 or newer is required!")
+ENDIF()
 
 # OS display name (version_compile_os etc).
 # Used by the test suite to ignore bugs on some platforms, 

cmake/os/WindowsCache.cmake

@@ -141,7 +141,6 @@ SET(HAVE_SCHED_GETCPU CACHE  INTERNAL "")
 SET(HAVE_SCHED_H CACHE  INTERNAL "")
 SET(HAVE_SCHED_YIELD CACHE  INTERNAL "")
 SET(HAVE_SELECT_H CACHE  INTERNAL "")
-SET(HAVE_SETENV CACHE  INTERNAL "")
 SET(HAVE_SETFD CACHE  INTERNAL "")
 SET(HAVE_SIGACTION CACHE  INTERNAL "")
 SET(HAVE_SIGINT 1 CACHE  INTERNAL "")
@@ -198,14 +197,12 @@ SET(HAVE_SYS_DEVPOLL_H CACHE  INTERNAL "")
 SET(HAVE_SYS_DIR_H CACHE  INTERNAL "")
 SET(HAVE_SYS_EPOLL_H CACHE  INTERNAL "")
 SET(HAVE_SYS_IOCTL_H CACHE  INTERNAL "")
-SET(HAVE_SYS_IPC_H CACHE  INTERNAL "")
 SET(HAVE_SYS_MALLOC_H CACHE  INTERNAL "")
 SET(HAVE_SYS_MMAN_H CACHE  INTERNAL "")
 SET(HAVE_SYS_PARAM_H CACHE  INTERNAL "")
 SET(HAVE_SYS_PRCTL_H CACHE  INTERNAL "")
 SET(HAVE_SYS_RESOURCE_H CACHE  INTERNAL "")
 SET(HAVE_SYS_SELECT_H CACHE  INTERNAL "")
-SET(HAVE_SYS_SHM_H CACHE  INTERNAL "")
 SET(HAVE_SYS_SOCKET_H CACHE  INTERNAL "")
 SET(HAVE_SYS_STAT_H 1 CACHE  INTERNAL "")
 SET(HAVE_SYS_TIMES_H CACHE  INTERNAL "")

config.h.cmake

@@ -55,14 +55,12 @@
 #cmakedefine HAVE_SYS_DIR_H 1
 #cmakedefine HAVE_SYS_CDEFS_H 1
 #cmakedefine HAVE_SYS_IOCTL_H 1
-#cmakedefine HAVE_SYS_IPC_H 1
 #cmakedefine HAVE_SYS_MALLOC_H 1
 #cmakedefine HAVE_SYS_MMAN_H 1
 #cmakedefine HAVE_SYS_NDIR_H 1
 #cmakedefine HAVE_SYS_PRCTL_H 1
 #cmakedefine HAVE_SYS_RESOURCE_H 1
 #cmakedefine HAVE_SYS_SELECT_H 1
-#cmakedefine HAVE_SYS_SHM_H 1
 #cmakedefine HAVE_SYS_SOCKET_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_TIMES_H 1
@@ -135,7 +133,6 @@
 #cmakedefine HAVE_GETGID 1
 #cmakedefine HAVE_GETEGID 1
 #cmakedefine HAVE_ISINF 1
-#cmakedefine HAVE_LARGE_PAGE_OPTION 1
 #cmakedefine HAVE_LRAND48 1
 #cmakedefine HAVE_LOG2 1
 #cmakedefine HAVE_LSTAT 1
@@ -145,7 +142,6 @@
 #cmakedefine HAVE_MADVISE 1
 #cmakedefine HAVE_DECL_MADVISE 1
 #cmakedefine HAVE_DECL_TGOTO 1
-#cmakedefine HAVE_DECL_MHA_MAPSIZE_VA
 #cmakedefine HAVE_MALLOC_INFO 1
 #cmakedefine HAVE_MLOCKALL 1
 #cmakedefine HAVE_MMAP 1
@@ -171,7 +167,6 @@
 #cmakedefine HAVE_SCHED_YIELD 1
 #cmakedefine HAVE_SELECT 1
 #cmakedefine HAVE_SETFD 1
-#cmakedefine HAVE_SETENV 1
 #cmakedefine HAVE_SIGSET 1
 #cmakedefine HAVE_SIGACTION 1
 #cmakedefine HAVE_SLEEP 1
@@ -288,9 +283,7 @@
 #cmakedefine MY_ATOMIC_MODE_RWLOCKS 1
 #cmakedefine HAVE_GCC_ATOMIC_BUILTINS 1
 #cmakedefine HAVE_SOLARIS_ATOMIC 1
-#cmakedefine HAVE_DECL_SHM_HUGETLB 1
-#cmakedefine HAVE_LARGE_PAGES 1
-#cmakedefine HUGETLB_USE_PROC_MEMINFO 1
+#cmakedefine HAVE_LINUX_LARGE_PAGES 1
 #cmakedefine NO_FCNTL_NONBLOCK 1
 
 #cmakedefine _LARGE_FILES 1
@@ -350,11 +343,6 @@
 
 #cmakedefine ssize_t @ssize_t@
 
-#if (_MSC_VER > 1310)
-# define HAVE_SETENV
-#define setenv(a,b,c) _putenv_s(a,b)
-#endif
-
 /*
    Memcached config options
 */

configure.cmake

@@ -361,13 +361,11 @@ CHECK_INCLUDE_FILES (synch.h HAVE_SYNCH_H)
 CHECK_INCLUDE_FILES (sysent.h HAVE_SYSENT_H)
 CHECK_INCLUDE_FILES (sys/cdefs.h HAVE_SYS_CDEFS_H)
 CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILES (sys/ipc.h HAVE_SYS_IPC_H)
 CHECK_INCLUDE_FILES (sys/malloc.h HAVE_SYS_MALLOC_H)
 CHECK_INCLUDE_FILES (sys/mman.h HAVE_SYS_MMAN_H)
 CHECK_INCLUDE_FILES (sys/prctl.h HAVE_SYS_PRCTL_H)
 CHECK_INCLUDE_FILES (sys/resource.h HAVE_SYS_RESOURCE_H)
 CHECK_INCLUDE_FILES (sys/select.h HAVE_SYS_SELECT_H)
-CHECK_INCLUDE_FILES (sys/shm.h HAVE_SYS_SHM_H)
 CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILES ("curses.h;term.h" HAVE_TERM_H)
@@ -495,7 +493,7 @@ CHECK_FUNCTION_EXISTS (mmap64 HAVE_MMAP64)
 CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
 CHECK_FUNCTION_EXISTS (posix_fallocate HAVE_POSIX_FALLOCATE)
 CHECK_FUNCTION_EXISTS (posix_memalign HAVE_POSIX_MEMALIGN)
-CHECK_FUNCTION_EXISTS (pread HAVE_PREAD)
+CHECK_FUNCTION_EXISTS (pread HAVE_PREAD) # Used by NDB
 CHECK_FUNCTION_EXISTS (pthread_attr_getguardsize HAVE_PTHREAD_ATTR_GETGUARDSIZE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
 CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
@@ -504,7 +502,6 @@ CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R)
 CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK)
 CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH)
 CHECK_FUNCTION_EXISTS (sched_yield HAVE_SCHED_YIELD)
-CHECK_FUNCTION_EXISTS (setenv HAVE_SETENV)
 CHECK_FUNCTION_EXISTS (setfd HAVE_SETFD)
 CHECK_FUNCTION_EXISTS (sigaction HAVE_SIGACTION)
 CHECK_FUNCTION_EXISTS (sigset HAVE_SIGSET)

include/my_global.h

@@ -938,17 +938,4 @@ enum loglevel {
    INFORMATION_LEVEL= 2
 };
 
-
-/*
-  Visual Studio before the version 2010 did not have lldiv_t.
-  In Visual Studio 2010, _MSC_VER is defined as 1600.
-*/
-#if defined(_MSC_VER) && (_MSC_VER < 1600)
-typedef struct
-{
-  long long int quot;   /* Quotient.  */
-  long long int rem;    /* Remainder.  */
-} lldiv_t;
-#endif
-
 #endif  // MY_GLOBAL_INCLUDED

include/my_sys.h

@@ -205,15 +205,15 @@ extern void (*debug_sync_C_callback_ptr)(const char *, size_t);
 #define DEBUG_SYNC_C_IF_THD(thd, _sync_point_name_)
 #endif /* defined(ENABLED_DEBUG_SYNC) */
 
-#ifdef HAVE_LARGE_PAGES
+#ifdef HAVE_LINUX_LARGE_PAGES
 extern uint my_get_large_page_size(void);
 extern uchar * my_large_malloc(PSI_memory_key key, size_t size, myf my_flags);
 extern void my_large_free(uchar *ptr);
 #else
 #define my_get_large_page_size() (0)
 #define my_large_malloc(A,B,C) my_malloc((A),(B),(C))
 #define my_large_free(A) my_free((A))
-#endif /* HAVE_LARGE_PAGES */
+#endif /* HAVE_LINUX_LARGE_PAGES */
 
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
 #define alloca __builtin_alloca
@@ -237,7 +237,7 @@ extern ulong my_thread_stack_size;
 extern void (*proc_info_hook)(void *, const PSI_stage_info *, PSI_stage_info *,
                               const char *, const char *, const unsigned int);
 
-#ifdef HAVE_LARGE_PAGES
+#ifdef HAVE_LINUX_LARGE_PAGES
 extern my_bool my_use_large_pages;
 extern uint    my_large_page_size;
 #endif
@@ -309,9 +309,6 @@ struct st_my_file_info
   int    oflag;     /* open flags, e.g O_APPEND */
 #endif
   enum   file_type	type;
-#if !defined(HAVE_PREAD) && !defined(_WIN32)
-  mysql_mutex_t mutex;
-#endif
 };
 
 extern struct st_my_file_info *my_file_info;

libmysqld/lib_sql.cc

@@ -1331,10 +1331,6 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
   return FALSE;
 }
 
-#if defined(_MSC_VER) && _MSC_VER < 1400
-#define vsnprintf _vsnprintf
-#endif
-
 void error_log_print(enum loglevel level __attribute__((unused)),
                      const char *format, va_list argsi)
 {

mysys/CMakeLists.txt

@@ -57,7 +57,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
    PROPERTIES COMPILE_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il")
 ENDIF()
 
-IF(HAVE_LARGE_PAGES)
+IF(HAVE_LINUX_LARGE_PAGES)
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c)
 ENDIF()
 

mysys/mf_iocache.c

@@ -1442,7 +1442,7 @@ int my_block_write(IO_CACHE *info, const uchar *Buffer, size_t Count,
     Buffer+=length;
     pos+=  length;
     Count-= length;
-#ifndef HAVE_PREAD
+#ifdef _WIN32
     info->seek_not_done=1;
 #endif
   }

mysys/my_init.c

@@ -358,18 +358,9 @@ static void my_win_init(void)
   DBUG_ENTER("my_win_init");
 
 #if defined(_MSC_VER)
-#if _MSC_VER < 1300
-  /*
-    Clear the OS system variable TZ and avoid the 100% CPU usage
-    Only for old versions of Visual C++
-  */
-  _putenv("TZ=");
-#endif
-#if _MSC_VER >= 1400
   /* this is required to make crt functions return -1 appropriately */
   _set_invalid_parameter_handler(my_parameter_handler);
 #endif
-#endif
 
 #ifdef __MSVC_RUNTIME_CHECKS
   /*
@@ -457,10 +448,6 @@ PSI_stage_info stage_waiting_for_table_level_lock=
 
 #ifdef HAVE_PSI_INTERFACE
 
-#if !defined(HAVE_PREAD) && !defined(_WIN32)
-PSI_mutex_key key_my_file_info_mutex;
-#endif /* !defined(HAVE_PREAD) && !defined(_WIN32) */
-
 PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock,
   key_IO_CACHE_SHARE_mutex, key_KEY_CACHE_cache_lock, key_LOCK_alarm,
   key_my_thread_var_mutex, key_THR_LOCK_charset, key_THR_LOCK_heap,
@@ -471,9 +458,6 @@ PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock,
 
 static PSI_mutex_info all_mysys_mutexes[]=
 {
-#if !defined(HAVE_PREAD) && !defined(_WIN32)
-  { &key_my_file_info_mutex, "st_my_file_info:mutex", 0},
-#endif /* !defined(HAVE_PREAD) && !defined(_WIN32) */
   { &key_BITMAP_mutex, "BITMAP::mutex", 0},
   { &key_IO_CACHE_append_buffer_lock, "IO_CACHE::append_buffer_lock", 0},
   { &key_IO_CACHE_SHARE_mutex, "IO_CACHE::SHARE_mutex", 0},
@@ -506,16 +490,16 @@ static PSI_cond_info all_mysys_conds[]=
   { &key_THR_COND_threads, "THR_COND_threads", 0}
 };
 
-#ifdef HUGETLB_USE_PROC_MEMINFO
+#ifdef HAVE_LINUX_LARGE_PAGES
 PSI_file_key key_file_proc_meminfo;
-#endif /* HUGETLB_USE_PROC_MEMINFO */
+#endif /* HAVE_LINUX_LARGE_PAGES */
 PSI_file_key key_file_charset, key_file_cnf;
 
 static PSI_file_info all_mysys_files[]=
 {
-#ifdef HUGETLB_USE_PROC_MEMINFO
+#ifdef HAVE_LINUX_LARGE_PAGES
   { &key_file_proc_meminfo, "proc_meminfo", 0},
-#endif /* HUGETLB_USE_PROC_MEMINFO */
+#endif /* HAVE_LINUX_LARGE_PAGES */
   { &key_file_charset, "charset", 0},
   { &key_file_cnf, "cnf", 0}
 };

mysys/my_largepage.c

@@ -15,15 +15,8 @@
 
 #include "mysys_priv.h"
 
-#ifdef HAVE_LARGE_PAGES
-
-#ifdef HAVE_SYS_IPC_H
 #include <sys/ipc.h>
-#endif
-
-#ifdef HAVE_SYS_SHM_H
 #include <sys/shm.h>
-#endif
 
 static uint my_get_large_page_size_int(void);
 static uchar* my_large_malloc_int(size_t size, myf my_flags);
@@ -85,7 +78,6 @@ void my_large_free(uchar* ptr)
   DBUG_VOID_RETURN;
 }
 
-#ifdef HUGETLB_USE_PROC_MEMINFO
 /* Linux-specific function to determine the size of large pages */
 
 uint my_get_large_page_size_int(void)
@@ -108,9 +100,7 @@ uint my_get_large_page_size_int(void)
 finish:
   DBUG_RETURN(size * 1024);
 }
-#endif /* HUGETLB_USE_PROC_MEMINFO */
 
-#if HAVE_DECL_SHM_HUGETLB
 /* Linux-specific large pages allocator  */
 
 uchar* my_large_malloc_int(size_t size, myf my_flags)
@@ -164,6 +154,3 @@ my_bool my_large_free_int(uchar *ptr)
   DBUG_ENTER("my_large_free_int");
   DBUG_RETURN(shmdt(ptr) == 0);
 }
-#endif /* HAVE_DECL_SHM_HUGETLB */
-
-#endif /* HAVE_LARGE_PAGES */