1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19508: SI_KERNEL is not on all implementations

Browse Source 
SI_USER is, however in FreeBSD there are a couple of non-kernel
user signal infomations above SI_KERNEL.

Put a fallback just in case there is nothing available.
This commit is contained in:
Daniel Black 2021-04-06 16:57:38 +10:00
parent 5b71e0424c
commit f69c1c9dcb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_pthread.h
View File

@ -197,7 +197,6 @@ static inline int my_sigwait(sigset_t *set, int *sig, int *code)
*code= siginfo.si_code; *code= siginfo.si_code;
return *sig < 0 ? errno : 0; return *sig < 0 ? errno : 0;
#else #else
#define SI_KERNEL 128
*code= 0; *code= 0;
return sigwait(set, sig); return sigwait(set, sig);
#endif #endif

6
sql/mysqld.cc
View File

@ -3253,7 +3253,13 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
} }
break; break;
case SIGHUP: case SIGHUP:
#if defined(SI_KERNEL)
if (!abort_loop && origin != SI_KERNEL) if (!abort_loop && origin != SI_KERNEL)
#elif defined(SI_USER)
if (!abort_loop && origin <= SI_USER)
#else
if (!abort_loop)
#endif
{ {
int not_used; int not_used;
mysql_print_status(); // Print some debug info mysql_print_status(); // Print some debug info