diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:25:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:25:48 +0300 |
| commit | 75c01f39b1b4a6d27d36d075f8baab9bdda7cc7e (patch) | |
| tree | dff54cd8894bf7f9b46847fb1d3e03690179cf11 /sql/signal_handler.cc | |
| parent | 562bbf5212412437273a469fc59138a939f123cd (diff) | |
| parent | 922e676b43c7b5cb0f20ca67c6d2222e2fc5ec03 (diff) | |
| download | mariadb-git-75c01f39b1b4a6d27d36d075f8baab9bdda7cc7e.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/signal_handler.cc')
| -rw-r--r-- | sql/signal_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/signal_handler.cc b/sql/signal_handler.cc index 79fb77e38d2..c0f31077e4d 100644 --- a/sql/signal_handler.cc +++ b/sql/signal_handler.cc @@ -31,7 +31,7 @@ #endif -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) #include <sys/sysctl.h> #endif @@ -56,7 +56,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 */ -#if defined(HAVE_READLINK) && !defined(__APPLE__) +#if defined(HAVE_READLINK) && !defined(__APPLE__) && !defined(__FreeBSD__) char buff[PATH_MAX]; ssize_t len; int fd; @@ -82,7 +82,7 @@ static inline void output_core_info() my_close(fd, MYF(0)); } #endif -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) char buff[PATH_MAX]; size_t len = sizeof(buff); if (sysctlbyname("kern.corefile", buff, &len, NULL, 0) == 0) |