1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge remote-tracking branch '10.4' into 10.5

This commit is contained in:
Oleksandr Byelkin
2023-03-31 21:32:41 +02:00
306 changed files with 10920 additions and 6615 deletions

View File

@ -27,6 +27,7 @@
#ifdef __WIN__
#include <crtdbg.h>
#include <direct.h>
#define SIGNAL_FMT "exception 0x%x"
#else
#define SIGNAL_FMT "signal %d"
@ -66,30 +67,30 @@ static inline void output_core_info()
(int) len, buff);
}
#ifdef __FreeBSD__
if ((fd= my_open("/proc/curproc/rlimit", O_RDONLY, MYF(0))) >= 0)
if ((fd= open("/proc/curproc/rlimit", O_RDONLY, MYF(0))) >= 0)
#else
if ((fd= my_open("/proc/self/limits", O_RDONLY, MYF(0))) >= 0)
if ((fd= open("/proc/self/limits", O_RDONLY, MYF(0))) >= 0)
#endif
{
my_safe_printf_stderr("Resource Limits:\n");
while ((len= my_read(fd, (uchar*)buff, sizeof(buff), MYF(0))) > 0)
while ((len= read(fd, (uchar*)buff, sizeof(buff))) > 0)
{
my_write_stderr(buff, len);
}
my_close(fd, MYF(0));
close(fd);
}
#ifdef __linux__
if ((fd= my_open("/proc/sys/kernel/core_pattern", O_RDONLY, MYF(0))) >= 0)
if ((fd= open("/proc/sys/kernel/core_pattern", O_RDONLY, MYF(0))) >= 0)
{
len= my_read(fd, (uchar*)buff, sizeof(buff), MYF(0));
len= read(fd, (uchar*)buff, sizeof(buff));
my_safe_printf_stderr("Core pattern: %.*s\n", (int) len, buff);
my_close(fd, MYF(0));
close(fd);
}
if ((fd= my_open("/proc/version", O_RDONLY, MYF(0))) >= 0)
if ((fd= open("/proc/version", O_RDONLY)) >= 0)
{
len= my_read(fd, (uchar*)buff, sizeof(buff), MYF(0));
len= read(fd, (uchar*)buff, sizeof(buff));
my_safe_printf_stderr("Kernel version: %.*s\n", (int) len, buff);
my_close(fd, MYF(0));
close(fd);
}
#endif
#elif defined(__APPLE__) || defined(__FreeBSD__)
@ -103,11 +104,14 @@ static inline void output_core_info()
{
my_safe_printf_stderr("Kernel version: %.*s\n", (int) len, buff);
}
#else
#elif defined(HAVE_GETCWD)
char buff[80];
my_getwd(buff, sizeof(buff), 0);
my_safe_printf_stderr("Writing a core file at %s\n", buff);
fflush(stderr);
if (getcwd(buff, sizeof(buff)))
{
my_safe_printf_stderr("Writing a core file at %.*s\n", (int) sizeof(buff), buff);
fflush(stderr);
}
#endif
}