database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-31 11:05:21 +03:00
parent bf310b4cfb 8341f582b2
commit 5eae8c2742
37 changed files with 881 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/signal_handler.cc
View File

@ -31,6 +31,11 @@
#define SIGNAL_FMT "signal %d"
#endif
#ifdef __APPLE__
#include <sys/sysctl.h>
#endif
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif
@ -49,7 +54,7 @@ extern const char *optimizer_switch_names[];
static inline void output_core_info()
{
/* proc is optional on some BSDs so it can't hurt to look */
#ifdef HAVE_READLINK
#if defined(HAVE_READLINK) && !defined(__APPLE__)
char buff[PATH_MAX];
ssize_t len;
int fd;
@ -80,6 +85,13 @@ static inline void output_core_info()
my_close(fd, MYF(0));
}
#endif
#elif defined(__APPLE__)
char buff[PATH_MAX];
size_t len = sizeof(buff);
if (sysctlbyname("kern.corefile", buff, &len, NULL, 0) == 0)
{
my_safe_printf_stderr("Core pattern: %.*s\n", (int) len, buff);
}
#else
char buff[80];
my_getwd(buff, sizeof(buff), 0);