diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-03-08 14:35:12 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-03-08 14:35:12 -0500 |
| commit | 0a55720a55f21363de137e2389ba8196e40471bb (patch) | |
| tree | 7d6f10d4b1680da801d57460360505f36f9d9ac1 /20032_all_mariadb-10.2.12-fix-address-resolve.patch | |
| parent | client-libs: Fix creation of my_print_defaults but keep it from install (diff) | |
| download | mysql-extras-0a55720a55f21363de137e2389ba8196e40471bb.tar.gz mysql-extras-0a55720a55f21363de137e2389ba8196e40471bb.tar.bz2 mysql-extras-0a55720a55f21363de137e2389ba8196e40471bb.zip | |
Add new upstream patchesmysql-extras-20180308-1938Z
Fix MDEV-15254 10.1.31 does not join an existing cluster with SST
Fix MDEV-15345 Compilation fails to build my_addr_resolve.c
Diffstat (limited to '20032_all_mariadb-10.2.12-fix-address-resolve.patch')
| -rw-r--r-- | 20032_all_mariadb-10.2.12-fix-address-resolve.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/20032_all_mariadb-10.2.12-fix-address-resolve.patch b/20032_all_mariadb-10.2.12-fix-address-resolve.patch new file mode 100644 index 0000000..13dbfd5 --- /dev/null +++ b/20032_all_mariadb-10.2.12-fix-address-resolve.patch @@ -0,0 +1,29 @@ +From 8ea4f7e4eebefa5daa98f0098b031095b98a1918 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <serg@mariadb.org> +Date: Thu, 22 Feb 2018 15:58:07 +0100 +Subject: [PATCH] MDEV-15345 Compilation fails to build my_addr_resolve.c + +fix the compilation error. +no support for plugins yet. +--- + mysys/my_addr_resolve.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c +index 10f8552f226b..84bff47d1a93 100644 +--- a/mysys/my_addr_resolve.c ++++ b/mysys/my_addr_resolve.c +@@ -49,6 +49,13 @@ static const char *strip_path(const char *s) + static bfd *bfdh= 0; + static asymbol **symtable= 0; + ++#if defined(HAVE_LINK_H) && defined(HAVE_DLOPEN) ++#include <link.h> ++static ElfW(Addr) offset= 0; ++#else ++#define offset 0 ++#endif ++ + /** + finds a file name, a line number, and a function name corresponding to addr. + |