diff options
| author | flo <flo@FreeBSD.org> | 2015-10-11 07:17:57 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2015-10-11 07:17:57 +0800 |
| commit | 657a17801577735cbb57e0821090ac54e95686b2 (patch) | |
| tree | da2a9d7f2d52d3a379d300a2b3e1673c700f28a7 /databases/percona56-server | |
| parent | 2929c7e42fbfe9ea9778cb6c9023e37648ff982f (diff) | |
| download | freebsd-ports-gnome-657a17801577735cbb57e0821090ac54e95686b2.tar.gz freebsd-ports-gnome-657a17801577735cbb57e0821090ac54e95686b2.tar.zst freebsd-ports-gnome-657a17801577735cbb57e0821090ac54e95686b2.zip | |
Update to 5.6.26.74.0
PR: 203148
Submitted by: Thomas Babut <tbabut@mobileobjects.de>
Diffstat (limited to 'databases/percona56-server')
| -rw-r--r-- | databases/percona56-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/percona56-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/percona56-server/files/patch-sql_mysqld.cc | 19 | ||||
| -rw-r--r-- | databases/percona56-server/files/patch-vio_viosocket.c | 13 | ||||
| -rw-r--r-- | databases/percona56-server/pkg-plist | 3 |
5 files changed, 38 insertions, 3 deletions
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 8bea9a732a5f..fe11460349d3 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.24-72.2 +DISTVERSION= 5.6.26-74.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index 52209079cac7..5d7b0fab4956 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.24-72.2.tar.gz) = 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de -SIZE (percona-server-5.6.24-72.2.tar.gz) = 34099689 +SHA256 (percona-server-5.6.26-74.0.tar.gz) = 9156038d84bd1190a5b5df963877876584d30bd515ba3ad39e65a532430c1608 +SIZE (percona-server-5.6.26-74.0.tar.gz) = 54819177 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; diff --git a/databases/percona56-server/files/patch-vio_viosocket.c b/databases/percona56-server/files/patch-vio_viosocket.c new file mode 100644 index 000000000000..dee21830f520 --- /dev/null +++ b/databases/percona56-server/files/patch-vio_viosocket.c @@ -0,0 +1,13 @@ +--- vio/viosocket.c.orig 2015-07-08 07:38:39 UTC ++++ vio/viosocket.c +@@ -33,6 +33,10 @@ + static void (*before_io_wait)(void)= 0; + static void (*after_io_wait)(void)= 0; + ++#ifdef __FreeBSD__ ++#define s6_addr32 __u6_addr.__u6_addr32 ++#endif ++ + /* Wait callback macros (both performance schema and threadpool */ + #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \ + do \ diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist index 829c6010a47b..c17c748e8054 100644 --- a/databases/percona56-server/pkg-plist +++ b/databases/percona56-server/pkg-plist @@ -139,6 +139,9 @@ man/man8/mysqld.8.gz %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/tests/suite/query_response_time/basic.result %%DATADIR%%/tests/suite/query_response_time/basic.test +%%DATADIR%%/tests/suite/query_response_time/bug1453277-master.opt +%%DATADIR%%/tests/suite/query_response_time/bug1453277.result +%%DATADIR%%/tests/suite/query_response_time/bug1453277.test %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result |