diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2015-10-10 23:17:57 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2015-10-10 23:17:57 +0000 |
| commit | 33578b458e5112e4270bd3889b0508e31560ba2e (patch) | |
| tree | da2a9d7f2d52d3a379d300a2b3e1673c700f28a7 /databases/percona56-server/files/patch-sql_mysqld.cc | |
| parent | - Convert to new options target helper (diff) | |
Update to 5.6.26.74.0
PR: 203148
Submitted by: Thomas Babut <tbabut@mobileobjects.de>
Diffstat (limited to 'databases/percona56-server/files/patch-sql_mysqld.cc')
| -rw-r--r-- | databases/percona56-server/files/patch-sql_mysqld.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/databases/percona56-server/files/patch-sql_mysqld.cc b/databases/percona56-server/files/patch-sql_mysqld.cc new file mode 100644 index 000000000000..586f267f28c6 --- /dev/null +++ b/databases/percona56-server/files/patch-sql_mysqld.cc @@ -0,0 +1,19 @@ +--- sql/mysqld.cc.orig 2015-07-25 17:06:21 UTC ++++ sql/mysqld.cc +@@ -2117,6 +2117,16 @@ + #ifndef EMBEDDED_LIBRARY + + /* Initialise proxy protocol. */ ++ ++/* At least OpenBSD and NexentaCore do not ++* define s6_addr32 for user land settings. ++*/ ++#if !defined s6_addr32 && defined __sun__ ++# define s6_addr32 _S6_un._S6_u32 ++#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ ) ++# define s6_addr32 __u6_addr.__u6_addr32 ++#endif /* !defined s6_addr32 */ ++ + static void set_proxy() + { + const char *p; |