diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 17:37:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 17:37:22 +0200 |
| commit | 2ac1edb1c319db967e7424793c799bbc9824b8f4 (patch) | |
| tree | 11274313e57e0f1e782ebed88ada411ad2f2e05d /mysys | |
| parent | e572c745dc04ac7659a40849abce62f39a0b09d4 (diff) | |
| parent | a732d5e2ba3d63a08e20670535d4cd29f667daf0 (diff) | |
| download | mariadb-git-2ac1edb1c319db967e7424793c799bbc9824b8f4.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_addr_resolve.c | 2 | ||||
| -rw-r--r-- | mysys/my_gethwaddr.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index 4948ad3e698..2d4385f4684 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -202,7 +202,7 @@ int start_addr2line_fork(const char *binary_path) close(out[0]); close(out[1]); execlp("addr2line", "addr2line", "-C", "-f", "-e", binary_path, NULL); - exit(1); + _exit(1); } close(in[0]); diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 6bba553a549..24054aa4151 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -23,7 +23,7 @@ #ifndef MAIN -#if defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__sun) || defined(_WIN32) +#if defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__sun) || defined(_WIN32) static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) { uint i, res= 1; @@ -35,8 +35,14 @@ static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) } #endif -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#ifdef __OpenBSD__ +#include <netinet/in.h> +#include <net/if_arp.h> +#include <netinet/if_ether.h> +#else #include <net/ethernet.h> +#endif #include <sys/sysctl.h> #include <net/route.h> #include <net/if.h> |