svn commit: r314602 - in head/databases: . percona56-client percona56-client/files percona56-server percona56-server/files

Mon Mar 18 21:18:04 UTC 2013

Author: flo
Date: Mon Mar 18 21:18:03 2013
New Revision: 314602
URL: http://svnweb.freebsd.org/changeset/ports/314602

Log:
  Add the 5.6 branch of Percona-Server.
  
  While MySQL 5.6.10 is considered GA, Percona still considers Percona-Server
  5.6.10 alpha software.

Added:
  head/databases/percona56-client/
     - copied from r312277, head/databases/mysql56-client/
  head/databases/percona56-client/files/patch-client__mysql.cc   (contents, props changed)
  head/databases/percona56-server/
     - copied from r312277, head/databases/mysql56-server/
Modified:
  head/databases/Makefile
  head/databases/percona56-client/Makefile
  head/databases/percona56-server/Makefile
  head/databases/percona56-server/distinfo   (contents, props changed)
  head/databases/percona56-server/files/patch-sql_mysqld.cc

Modified: head/databases/Makefile
==============================================================================

--- head/databases/Makefile	Mon Mar 18 21:06:42 2013	(r314601)
+++ head/databases/Makefile	Mon Mar 18 21:18:03 2013	(r314602)
@@ -544,6 +544,8 @@
     SUBDIR += percona-toolkit
     SUBDIR += percona55-client
     SUBDIR += percona55-server
+    SUBDIR += percona56-client
+    SUBDIR += percona56-server
     SUBDIR += pg_filedump
     SUBDIR += pg_reorg
     SUBDIR += pg_rman

Modified: head/databases/percona56-client/Makefile
==============================================================================
--- head/databases/mysql56-client/Makefile	Fri Feb 15 07:48:22 2013	(r312277)
+++ head/databases/percona56-client/Makefile	Mon Mar 18 21:18:03 2013	(r314602)
@@ -1,26 +1,25 @@
-# Created by: Alex Dupre <ale at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	mysql
+PORTNAME=	percona
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
 
-MASTERDIR=	${.CURDIR}/../mysql56-server
+MASTERDIR=	${.CURDIR}/../percona56-server
 
 PKGMESSAGE=	mustnotexist
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	mysql56-client
+LATEST_LINK=	percona56-client
 
-CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-57-9].* mariadb-client-5.* percona-client-5.*
+CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-57-9].*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
-MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
+MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
 

Added: head/databases/percona56-client/files/patch-client__mysql.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/percona56-client/files/patch-client__mysql.cc	Mon Mar 18 21:18:03 2013	(r314602)
@@ -0,0 +1,16 @@
+--- client/mysql.cc.orig	2012-02-27 19:15:22.271243107 +0000
++++ client/mysql.cc	2012-02-27 19:16:16.645241508 +0000
+@@ -1601,11 +1601,11 @@
+ #endif
+ 
+ #ifdef HAVE_READLINE
+-  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",
++  printf("%s  Ver %s Distrib %s Percona, for %s (%s) using %s %s\n",
+ 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
+          readline, rl_library_version);
+ #else
+-  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
++  printf("%s  Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER,
+ 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
+ #endif
+ 

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Fri Feb 15 07:48:22 2013	(r312277)
+++ head/databases/percona56-server/Makefile	Mon Mar 18 21:18:03 2013	(r314602)
@@ -1,21 +1,28 @@
-# Created by: Alex Dupre <ale at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	mysql
-PORTVERSION=	5.6.10
+PORTNAME?=	percona
+DISTVERSION=	5.6.10-alpha60.2
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.6
+MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
 PKGNAMESUFFIX?=	-server
+DISTNAME=	Percona-Server-5.6.10-alpha60.2
 
 MAINTAINER=	ale at FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql56-client
+SLAVEDIRS=	databases/percona56-client
 USE_CMAKE=	yes
+USES=		bison
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS_DEFINE=	OPENSSL FASTMTX
+OPTIONS_DEFAULT=	OPENSSL
+FASTMTX_DESC=	Replace mutexes with spinlocks
+
+DATADIR=	${PREFIX}/share/mysql
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
@@ -32,20 +39,30 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_LIBEDIT=0 \
-		-DWITH_LIBWRAP=1
+		-DWITH_LIBWRAP=1 \
+		-DHAVE_PAM=0
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL}
+CMAKE_ARGS+=	-DWITH_SSL=bundled
+.endif
+.if ${PORT_OPTIONS:MFASTMTX}
+CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
+.endif
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	56
+WANT_MYSQL_VER=	56p
 
-LATEST_LINK=	mysql56-server
+LATEST_LINK=	percona56-server
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-57-9].* mariadb-server-5.* percona-server-5.*
+CONFLICTS_INSTALL=	mysql-server-[345].* percona-server-5.[0-57-9].* mariadb-server-[0-9].*
 
 USE_RC_SUBR=	mysql-server
 
@@ -61,8 +78,6 @@ MAN1=		my_print_defaults.1 myisam_ftdump
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
-MAN8=		mysqld.8
-
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 post-install:

Modified: head/databases/percona56-server/distinfo
==============================================================================
--- head/databases/mysql56-server/distinfo	Fri Feb 15 07:48:22 2013	(r312277)
+++ head/databases/percona56-server/distinfo	Mon Mar 18 21:18:03 2013	(r314602)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6
-SIZE (mysql-5.6.10.tar.gz) = 35174149
+SHA256 (Percona-Server-5.6.10-alpha60.2.tar.gz) = 25d0e4d309dd9dd6ac6b35363b5c02aa44a5263e46f7b28e4b05a846dbc24eff
+SIZE (Percona-Server-5.6.10-alpha60.2.tar.gz) = 32654985

Modified: head/databases/percona56-server/files/patch-sql_mysqld.cc
==============================================================================
--- head/databases/mysql56-server/files/patch-sql_mysqld.cc	Fri Feb 15 07:48:22 2013	(r312277)
+++ head/databases/percona56-server/files/patch-sql_mysqld.cc	Mon Mar 18 21:18:03 2013	(r314602)
@@ -1,6 +1,15 @@
---- sql/mysqld.cc.orig	2013-02-13 15:18:22.000000000 +0100
-+++ sql/mysqld.cc	2013-02-13 15:18:46.000000000 +0100
-@@ -6292,7 +6292,7 @@
+--- sql/mysqld.cc.orig	2013-03-05 00:04:54.000000000 +0100
++++ sql/mysqld.cc	2013-03-18 09:55:35.499120018 +0100
+@@ -6291,7 +6291,7 @@
+ 
+ #ifdef HAVE_LIBWRAP
+     {
+-      if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
++      if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock))
+       {
+         struct request_info req;
+         signal(SIGCHLD, SIG_DFL);
+@@ -6323,7 +6323,7 @@
              The connection was refused by TCP wrappers.
              There are no details (by client IP) available to update the host_cache.
            */
