Bug#25945568: MYSQL 5.7 FAILS TO BUILD WITH MUSL LIBC

              DUE TO NOT FINDING SIGEV_THREAD_ID

The problem was that posix_timers relied on non-posix standard
features which made the code not compile on Alpine Linux.
This patch rewrites the code to use standard posix. This means
that the ~same code can also be used on Solaris.

Also fix various minor other issues for compiling on Alpine.

Author: jhauglid

cmake/os/WindowsCache.cmake

@@ -149,8 +149,6 @@ SET(HAVE_LRAND48 CACHE  INTERNAL "")
 SET(GWINSZ_IN_SYS_IOCTL CACHE INTERNAL "")
 SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
 SET(FIONREAD_IN_SYS_FILIO CACHE INTERNAL "")
-SET(HAVE_SIGEV_THREAD_ID CACHE INTERNAL "")
-SET(HAVE_SIGEV_PORT CACHE INTERNAL "")
 
 SET(HAVE_C_ISINF TRUE CACHE INTERNAL "")   # Only needed by CMake
 SET(HAVE_CXX_ISINF TRUE CACHE INTERNAL "") # Only needed by CMake

config.h.cmake

@@ -146,8 +146,6 @@
 #cmakedefine GWINSZ_IN_SYS_IOCTL 1
 #cmakedefine FIONREAD_IN_SYS_IOCTL 1
 #cmakedefine FIONREAD_IN_SYS_FILIO 1
-#cmakedefine HAVE_SIGEV_THREAD_ID 1
-#cmakedefine HAVE_SIGEV_PORT 1
 
 #cmakedefine HAVE_ISINF 1
 

configure.cmake

@@ -434,8 +434,6 @@ CHECK_SYMBOL_EXISTS(lrand48 "stdlib.h" HAVE_LRAND48)
 CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL)
 CHECK_SYMBOL_EXISTS(FIONREAD "sys/ioctl.h" FIONREAD_IN_SYS_IOCTL)
 CHECK_SYMBOL_EXISTS(FIONREAD "sys/filio.h" FIONREAD_IN_SYS_FILIO)
-CHECK_SYMBOL_EXISTS(SIGEV_THREAD_ID "signal.h;time.h" HAVE_SIGEV_THREAD_ID)
-CHECK_SYMBOL_EXISTS(SIGEV_PORT "signal.h;time.h;sys/siginfo.h" HAVE_SIGEV_PORT)
 
 # On Solaris, it is only visible in C99 mode
 CHECK_SYMBOL_EXISTS(isinf "math.h" HAVE_C_ISINF)
@@ -463,9 +461,7 @@ CHECK_SYMBOL_EXISTS(EVFILT_TIMER "sys/types.h;sys/event.h;sys/time.h" HAVE_EVFIL
 IF(HAVE_KQUEUE AND HAVE_EVFILT_TIMER)
   SET(HAVE_KQUEUE_TIMERS 1 CACHE INTERNAL "Have kqueue timer-related filter")
 ELSEIF(HAVE_TIMER_CREATE AND HAVE_TIMER_SETTIME)
-  IF(HAVE_SIGEV_THREAD_ID OR HAVE_SIGEV_PORT)
-    SET(HAVE_POSIX_TIMERS 1 CACHE INTERNAL "Have POSIX timer-related functions")
-  ENDIF()
+  SET(HAVE_POSIX_TIMERS 1 CACHE INTERNAL "Have POSIX timer-related functions")
 ENDIF()
 
 IF(NOT HAVE_POSIX_TIMERS AND NOT HAVE_KQUEUE_TIMERS AND NOT WIN32)

include/my_timer.h

@@ -21,7 +21,6 @@
 */
 
 #include "my_config.h"
-#include "my_macros.h"
 
 struct st_my_timer;
 
@@ -54,13 +53,11 @@ struct st_my_timer
   void (*notify_function)(my_timer_t *);
 };
 
-C_MODE_START
-
 /* Initialize internal components. */
-int my_timer_initialize(void);
+int my_timer_initialize();
 
 /* Release any resources acquired. */
-void my_timer_deinitialize(void);
+void my_timer_deinitialize();
 
 /* Create a timer object. */
 int my_timer_create(my_timer_t *timer);
@@ -74,6 +71,4 @@ int my_timer_cancel(my_timer_t *timer, int *state);
 /* Delete a timer object. */
 void my_timer_delete(my_timer_t *timer);
 
-C_MODE_END
-
 #endif /* MY_TIMER_H */

libmysql/libmysql.cc

@@ -58,7 +58,7 @@
 #include <sys/select.h>
 #endif
 #ifdef HAVE_POLL
-#include <sys/poll.h>
+#include <poll.h>
 #endif
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>

mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result

@@ -14,7 +14,8 @@ UPDATE performance_schema.threads
 SET INSTRUMENTED = 'NO'
  WHERE NAME LIKE 'thread/innodb/srv\_%'
     OR NAME LIKE '%con\_%'
-    OR NAME LIKE '%signal_handler%';
+    OR NAME LIKE '%signal_handler%'
+    OR NAME LIKE '%thread_timer_notifier';
 CALL sys.ps_setup_show_enabled(FALSE, FALSE);
 performance_schema_enabled
 1
@@ -220,7 +221,6 @@ innodb/io_write_thread	BACKGROUND
 innodb/io_write_thread	BACKGROUND
 innodb/io_write_thread	BACKGROUND
 innodb/page_flush_coordinator_thread	BACKGROUND
-mysys/thread_timer_notifier	BACKGROUND
 root@localhost	FOREGROUND
 sql/compress_gtid_table	FOREGROUND
 sql/main	BACKGROUND
@@ -264,7 +264,6 @@ innodb/io_write_thread	BACKGROUND
 innodb/io_write_thread	BACKGROUND
 innodb/io_write_thread	BACKGROUND
 innodb/page_flush_coordinator_thread	BACKGROUND
-mysys/thread_timer_notifier	BACKGROUND
 root@localhost	FOREGROUND
 sql/compress_gtid_table	FOREGROUND
 sql/main	BACKGROUND

mysql-test/suite/sysschema/t/pr_ps_setup_show_enabled.test

@@ -24,7 +24,8 @@ UPDATE performance_schema.threads
    SET INSTRUMENTED = 'NO'
  WHERE NAME LIKE 'thread/innodb/srv\_%'
     OR NAME LIKE '%con\_%'
-    OR NAME LIKE '%signal_handler%';
+    OR NAME LIKE '%signal_handler%'
+    OR NAME LIKE '%thread_timer_notifier';
 
 # Show limited info (no thread or instrument info)
 CALL sys.ps_setup_show_enabled(FALSE, FALSE);

mysql-test/t/max_statement_time.test

@@ -2,7 +2,6 @@
 
 --source include/have_statement_timeout.inc
 --source include/have_debug.inc
---source include/not_valgrind.inc
 
 # Save the initial number of concurrent sessions.
 --source include/count_sessions.inc

mysql-test/valgrind.supp

@@ -25,6 +25,7 @@
    pthread allocate_tls memory loss
    Memcheck:Leak
    fun:calloc
+   ...
    fun:_dl_allocate_tls
    fun:allocate_stack
    fun:pthread_create*

mysys/my_error.cc

@@ -141,7 +141,7 @@ char *my_strerror(char *buf, size_t len, int nr)
        (defined _XOPEN_SOURCE   && (_XOPEN_SOURCE >= 600)))      &&    \
       ! defined _GNU_SOURCE
     strerror_r(nr, buf, len);             /* I can build with or without GNU */
-#elif defined _GNU_SOURCE && (!defined(__SUNPRO_C) && !defined(__SUNPRO_CC))
+#elif defined(__GLIBC__) && defined (_GNU_SOURCE)
     char *r= strerror_r(nr, buf, len);
     if (r != buf)                         /* Want to help, GNU? */
       strmake(buf, r, len - 1);           /* Then don't. */
@@ -154,8 +154,8 @@ char *my_strerror(char *buf, size_t len, int nr)
     strerror() return values are implementation-dependent, so let's
     be pragmatic.
   */
-  if (!buf[0])
-    strmake(buf, "unknown error", len - 1);
+  if (!buf[0] || !strcmp(buf, "No error information"))
+    strmake(buf, "Unknown error", len - 1);
 
   return buf;
 }