Skip to content

Commit

Permalink
Bug#17730320: REMOVE UNNEEDE CMAKE CHECKS AND #IFDEFS IN 5.7.4
Browse files Browse the repository at this point in the history 
Patch mysql#2. This patch removes the following CMake checks:

TIME_T_UNSIGNED - always false on supported platforms.
HAVE_GETADDRINFO - always true on supported platforms.
HAVE_SELECT - always true on supported platforms.
QSORT_TYPE_IS_VOID - always true on supported platforms.
HAVE_SOCKET_SIZE_T_AS_socklen_t - always true for non-Windows.
SIGNAL_RETURN_TYPE_IS_VOID - always true on supported platforms.
HAVE_POSIX_SIGNALS - result not used.
HAVE_BSD_SIGNALS - always false on supported platforms.
HAVE_SVR3_SIGNALS - result not used.
HAVE_V7_SIGNALS - result not used.

Remove the following typedefs:
puchar - not used
pshort - not used
pfloat - not used

Remove the following macros:
STRUCT_RLIMIT - always struct rlimit
sig_handler - always void
qsort_t - always void
SORT_RETURN - always return

Remove the following files:
dbug_long.h - not used
my_sleep.c - move contents to my_sys.h
  • Loading branch information
@jhauglid
jhauglid committed Jan 24, 2014
1 parent 4052915 commit 901d27f
Show file tree
Hide file tree
Showing 25 changed files with 64 additions and 471 deletions.
16 changes: 8 additions & 8 deletions client/mysql.cc
View file
Expand Up @@ -1136,11 +1136,11 @@ static void end_timer(ulong start_time,char *buff);
static void mysql_end_timer(ulong start_time,char *buff);
static void nice_time(double sec,char *buff,bool part_second);
static void kill_query(const char* reason);
extern "C" sig_handler mysql_end(int sig);
extern "C" sig_handler handle_ctrlc_signal(int sig);
extern "C" sig_handler handle_quit_signal(int sig);
extern "C" void mysql_end(int sig);
extern "C" void handle_ctrlc_signal(int sig);
extern "C" void handle_quit_signal(int sig);
#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
static sig_handler window_resize(int sig);
static void window_resize(int sig);
#endif

const char DELIMITER_NAME[]= "delimiter";
Expand Down Expand Up @@ -1413,7 +1413,7 @@ int main(int argc,char *argv[])
#endif
}

sig_handler mysql_end(int sig)
void mysql_end(int sig)
{
mysql_close(&mysql);
#ifdef HAVE_READLINE
Expand Down Expand Up @@ -1481,7 +1481,7 @@ sig_handler mysql_end(int sig)
@param [IN] Signal number
*/

sig_handler handle_ctrlc_signal(int sig)
void handle_ctrlc_signal(int sig)
{
sigint_received= 1;

Expand All @@ -1507,7 +1507,7 @@ sig_handler handle_ctrlc_signal(int sig)
@param [IN] Signal number
*/

sig_handler handle_quit_signal(int sig)
void handle_quit_signal(int sig)
{
const char *reason= "Terminal close";

Expand Down Expand Up @@ -1575,7 +1575,7 @@ void kill_query(const char *reason)


#if defined(HAVE_TERMIOS_H) && defined(GWINSZ_IN_SYS_IOCTL)
sig_handler window_resize(int sig)
void window_resize(int sig)
{
struct winsize window_size;

Expand Down
4 changes: 2 additions & 2 deletions client/mysqladmin.cc
View file
Expand Up @@ -77,7 +77,7 @@ extern "C" my_bool get_one_option(int optid, const struct my_option *opt,
static my_bool sql_connect(MYSQL *mysql, uint wait);
static int execute_commands(MYSQL *mysql,int argc, char **argv);
static int drop_db(MYSQL *mysql,const char *db);
extern "C" sig_handler endprog(int signal_number);
extern "C" void endprog(int signal_number);
static void nice_time(ulong sec,char *buff);
static void print_header(MYSQL_RES *result);
static void print_top(MYSQL_RES *result);
Expand Down Expand Up @@ -505,7 +505,7 @@ int main(int argc,char *argv[])
}


sig_handler endprog(int signal_number __attribute__((unused)))
void endprog(int signal_number __attribute__((unused)))
{
interrupted=1;
}
Expand Down
4 changes: 2 additions & 2 deletions client/mysqltest.cc
View file
Expand Up @@ -75,7 +75,7 @@ static int setenv(const char *name, const char *value, int overwrite);
#endif

C_MODE_START
static sig_handler signal_handler(int sig);
static void signal_handler(int sig);
static my_bool get_one_option(int optid, const struct my_option *,
char *argument);
C_MODE_END
Expand Down Expand Up @@ -8538,7 +8538,7 @@ static void dump_backtrace(void)

#endif

static sig_handler signal_handler(int sig)
static void signal_handler(int sig)
{
fprintf(stderr, "mysqltest got " SIGNAL_FMT "\n", sig);
dump_backtrace();
Expand Down
7 changes: 0 additions & 7 deletions cmake/os/WindowsCache.cmake
View file
Expand Up @@ -32,7 +32,6 @@ SET(HAVE_ASM_MSR_H CACHE INTERNAL "")
SET(HAVE_BACKTRACE CACHE INTERNAL "")
SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "")
SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "")
SET(HAVE_BSD_SIGNALS CACHE INTERNAL "")
SET(HAVE_BSS_START CACHE INTERNAL "")
SET(HAVE_CLOCK_GETTIME CACHE INTERNAL "")
SET(HAVE_COMPRESS CACHE INTERNAL "")
Expand Down Expand Up @@ -65,7 +64,6 @@ SET(HAVE_FPU_CONTROL_H CACHE INTERNAL "")
SET(HAVE_FSEEKO CACHE INTERNAL "")
SET(HAVE_FSYNC CACHE INTERNAL "")
SET(HAVE_FTRUNCATE CACHE INTERNAL "")
SET(HAVE_GETADDRINFO 1 CACHE INTERNAL "")
SET(HAVE_GETHOSTBYADDR_R CACHE INTERNAL "")
SET(HAVE_GETHRTIME CACHE INTERNAL "")
SET(HAVE_GETNAMEINFO CACHE INTERNAL "")
Expand Down Expand Up @@ -121,7 +119,6 @@ SET(HAVE_POPEN CACHE INTERNAL "")
SET(HAVE_POLL CACHE INTERNAL "")
SET(HAVE_POSIX_FALLOCATE CACHE INTERNAL "")
SET(HAVE_POSIX_MEMALIGN CACHE INTERNAL "")
SET(HAVE_POSIX_SIGNALS CACHE INTERNAL "")
SET(HAVE_PREAD CACHE INTERNAL "")
SET(HAVE_PRINTSTACK CACHE INTERNAL "")
SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
Expand All @@ -141,7 +138,6 @@ SET(HAVE_SASL_SASL_H CACHE INTERNAL "")
SET(HAVE_SCHED_GETCPU CACHE INTERNAL "")
SET(HAVE_SCHED_H CACHE INTERNAL "")
SET(HAVE_SCHED_YIELD CACHE INTERNAL "")
SET(HAVE_SELECT 1 CACHE INTERNAL "")
SET(HAVE_SELECT_H CACHE INTERNAL "")
SET(HAVE_SETENV CACHE INTERNAL "")
SET(HAVE_SETFD CACHE INTERNAL "")
Expand Down Expand Up @@ -191,7 +187,6 @@ ENDIF()
SET(HAVE_STRSEP CACHE INTERNAL "")
SET(HAVE_STRSIGNAL CACHE INTERNAL "")
SET(HAVE_STRTOLL CACHE INTERNAL "")
SET(HAVE_SVR3_SIGNALS CACHE INTERNAL "")
SET(HAVE_SYNCH_H CACHE INTERNAL "")
SET(HAVE_SYSENT_H CACHE INTERNAL "")
SET(HAVE_SYS_CDEFS_H CACHE INTERNAL "")
Expand Down Expand Up @@ -252,8 +247,6 @@ SET(TIME_WITH_SYS_TIME CACHE INTERNAL "")
SET(HAVE_S_IROTH CACHE INTERNAL "")
SET(HAVE_S_IFIFO CACHE INTERNAL "")
SET(HAVE_TAILQFOREACH CACHE INTERNAL "")
SET(QSORT_TYPE_IS_VOID 1 CACHE INTERNAL "")
SET(SIGNAL_RETURN_TYPE_IS_VOID 1 CACHE INTERNAL "")
SET(C_HAS_inline CACHE INTERNAL "")
SET(C_HAS___inline 1 CACHE INTERNAL "")
SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
Expand Down
16 changes: 0 additions & 16 deletions config.h.cmake
View file
Expand Up @@ -254,14 +254,6 @@

#cmakedefine MAX_INDEXES @MAX_INDEXES@

#cmakedefine QSORT_TYPE_IS_VOID 1
#cmakedefine RETQSORTTYPE @RETQSORTTYPE@

#cmakedefine SIGNAL_RETURN_TYPE_IS_VOID 1
#cmakedefine RETSIGTYPE @RETSIGTYPE@
#cmakedefine VOID_SIGHANDLER 1
#define STRUCT_RLIMIT struct rlimit

#cmakedefine WORDS_BIGENDIAN 1

/*
Expand Down Expand Up @@ -289,13 +281,6 @@
#cmakedefine HAVE_WEAK_SYMBOL 1
#cmakedefine HAVE_ABI_CXA_DEMANGLE 1


#cmakedefine HAVE_POSIX_SIGNALS 1
#cmakedefine HAVE_BSD_SIGNALS 1
#cmakedefine HAVE_SVR3_SIGNALS 1
#cmakedefine HAVE_V7_SIGNALS 1


#cmakedefine HAVE_SOLARIS_STYLE_GETHOST 1

#cmakedefine MY_ATOMIC_MODE_DUMMY 1
Expand Down Expand Up @@ -459,7 +444,6 @@
/* time_t related defines */

#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
#cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@

/* CPU information */

Expand Down
165 changes: 3 additions & 162 deletions configure.cmake
View file
Expand Up @@ -649,108 +649,13 @@ ENDIF()
# Code tests
#

# check whether time_t is unsigned
CHECK_C_SOURCE_COMPILES("
#include <time.h>
int main()
{
int array[(((time_t)-1) > 0) ? 1 : -1];
return 0;
}"
TIME_T_UNSIGNED)


CHECK_C_SOURCE_COMPILES("
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#endif
int main()
{
getaddrinfo( 0, 0, 0, 0);
return 0;
}"
HAVE_GETADDRINFO)

CHECK_C_SOURCE_COMPILES("
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#endif
int main()
{
select(0,0,0,0,0);
return 0;
}"
HAVE_SELECT)

#
# Check return type of qsort()
#
CHECK_C_SOURCE_COMPILES("
#include <stdlib.h>
#ifdef __cplusplus
extern \"C\"
#endif
void qsort(void *base, size_t nel, size_t width,
int (*compar) (const void *, const void *));
int main(int ac, char **av) {}
" QSORT_TYPE_IS_VOID)
IF(QSORT_TYPE_IS_VOID)
SET(RETQSORTTYPE "void")
ELSE(QSORT_TYPE_IS_VOID)
SET(RETQSORTTYPE "int")
ENDIF(QSORT_TYPE_IS_VOID)
SET(HAVE_GETADDRINFO 1) # Used by libevent
SET(HAVE_SELECT 1) # Used by NDB/libevent

IF(WIN32)
SET(SOCKET_SIZE_TYPE int)
SET(SOCKET_SIZE_TYPE int)
ELSE()
CHECK_CXX_SOURCE_COMPILES("
#include <sys/socket.h>
int main(int argc, char **argv)
{
getsockname(0,0,(socklen_t *) 0);
return 0;
}"
HAVE_SOCKET_SIZE_T_AS_socklen_t)

IF(HAVE_SOCKET_SIZE_T_AS_socklen_t)
SET(SOCKET_SIZE_TYPE socklen_t)
ELSE()
CHECK_CXX_SOURCE_COMPILES("
#include <sys/socket.h>
int main(int argc, char **argv)
{
getsockname(0,0,(int *) 0);
return 0;
}"
HAVE_SOCKET_SIZE_T_AS_int)
IF(HAVE_SOCKET_SIZE_T_AS_int)
SET(SOCKET_SIZE_TYPE int)
ELSE()
CHECK_CXX_SOURCE_COMPILES("
#include <sys/socket.h>
int main(int argc, char **argv)
{
getsockname(0,0,(size_t *) 0);
return 0;
}"
HAVE_SOCKET_SIZE_T_AS_size_t)
IF(HAVE_SOCKET_SIZE_T_AS_size_t)
SET(SOCKET_SIZE_TYPE size_t)
ELSE()
SET(SOCKET_SIZE_TYPE int)
ENDIF()
ENDIF()
ENDIF()
ENDIF()

CHECK_CXX_SOURCE_COMPILES("
Expand Down Expand Up @@ -783,29 +688,6 @@ IF(NOT STACK_DIRECTION)
ENDIF()
ENDIF()

#
# Check return type of signal handlers
#
CHECK_C_SOURCE_COMPILES("
#include <signal.h>
#ifdef signal
# undef signal
#endif
#ifdef __cplusplus
extern \"C\" void (*signal (int, void (*)(int)))(int);
#else
void (*signal ()) ();
#endif
int main(int ac, char **av) {}
" SIGNAL_RETURN_TYPE_IS_VOID)
IF(SIGNAL_RETURN_TYPE_IS_VOID)
SET(RETSIGTYPE void)
SET(VOID_SIGHANDLER 1)
ELSE(SIGNAL_RETURN_TYPE_IS_VOID)
SET(RETSIGTYPE int)
ENDIF(SIGNAL_RETURN_TYPE_IS_VOID)


CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
CHECK_SYMBOL_EXISTS(O_NONBLOCK "unistd.h;fcntl.h" HAVE_FCNTL_NONBLOCK)
IF(NOT HAVE_FCNTL_NONBLOCK)
Expand Down Expand Up @@ -861,47 +743,6 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
ENDIF()
ENDIF()

#
# Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
#
CHECK_C_SOURCE_COMPILES("
#include <signal.h>
int main(int ac, char **av)
{
sigset_t ss;
struct sigaction sa;
sigemptyset(&ss); sigsuspend(&ss);
sigaction(SIGINT, &sa, (struct sigaction *) 0);
sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0);
}"
HAVE_POSIX_SIGNALS)

IF(NOT HAVE_POSIX_SIGNALS)
CHECK_C_SOURCE_COMPILES("
#include <signal.h>
int main(int ac, char **av)
{
int mask = sigmask(SIGINT);
sigsetmask(mask); sigblock(mask); sigpause(mask);
}"
HAVE_BSD_SIGNALS)
IF (NOT HAVE_BSD_SIGNALS)
CHECK_C_SOURCE_COMPILES("
#include <signal.h>
void foo() { }
int main(int ac, char **av)
{
int mask = sigmask(SIGINT);
sigset(SIGINT, foo); sigrelse(SIGINT);
sighold(SIGINT); sigpause(SIGINT);
}"
HAVE_SVR3_SIGNALS)
IF (NOT HAVE_SVR3_SIGNALS)
SET(HAVE_V7_SIGNALS 1)
ENDIF(NOT HAVE_SVR3_SIGNALS)
ENDIF(NOT HAVE_BSD_SIGNALS)
ENDIF(NOT HAVE_POSIX_SIGNALS)

# Assume regular sprintf
SET(SPRINTFS_RETURNS_INT 1)

Expand Down

0 comments on commit 901d27f

Please sign in to comment.