components/database/percona-server-57/patches/04-in6_addr.patch

   1 https://bugs.launchpad.net/percona-server/+bug/1496315
   2 https://svnweb.freebsd.org/ports/head/databases/percona56-server/files/patch-sql_mysqld.cc?view=markup&pathrev=399074
   3
   4 --- percona-server-5.7.18-15/sql/mysqld.cc.~1~  2017-05-25 10:03:51.000000000 +0000
   5 +++ percona-server-5.7.18-15/sql/mysqld.cc      2017-07-25 10:41:57.046304506 +0000
   6 @@ -1482,6 +1482,16 @@
   7  ****************************************************************************/
   8
   9  /* Initialise proxy protocol. */
  10 +
  11 +/* At least OpenBSD and NexentaCore do not
  12 +* define s6_addr32 for user land settings.
  13 +*/
  14 +#if !defined s6_addr32 && defined __sun__
  15 +#       define s6_addr32 _S6_un._S6_u32
  16 +#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ )
  17 +#       define s6_addr32 __u6_addr.__u6_addr32
  18 +#endif  /* !defined s6_addr32 */
  19 +
  20  static void set_proxy()
  21  {
  22    const char *p;
  23 --- percona-server-5.6.28-76.1/vio/viosocket.c.1        2016-01-21 14:13:49.783597806 +0300
  24 +++ percona-server-5.6.28-76.1/vio/viosocket.c  2016-01-21 14:14:43.695032467 +0300
  25 @@ -29,6 +29,15 @@
  26  # include <sys/filio.h>
  27  #endif
  28
  29 +/* At least OpenBSD and NexentaCore do not
  30 + * define s6_addr32 for user land settings.
  31 + */
  32 +#if !defined s6_addr32 && defined __sun__
  33 +# define s6_addr32 _S6_un._S6_u32
  34 +#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ )
  35 +# define s6_addr32 __u6_addr.__u6_addr32
  36 +#endif /* !defined s6_addr32 */
  37 +
  38  /* Network io wait callbacks  for threadpool */
  39  static void (*before_io_wait)(void)= 0;
  40  static void (*after_io_wait)(void)= 0;