Add MySQL 6.0.5-alpha release.

8 files changed, 36 insertions, 28 deletions

diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 5a4b583553bf..cd01ebfdad6f 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
 
-MASTERDIR=	${.CURDIR}/../mysql51-server
+MASTERDIR=	${.CURDIR}/../mysql60-server
 
 PKGINSTALL=	mustnotexist
 PKGMESSAGE=	mustnotexist
diff --git a/databases/mysql60-scripts/Makefile b/databases/mysql60-scripts/Makefile
index bb4acfcf8a31..52797ae9b849 100644
--- a/databases/mysql60-scripts/Makefile
+++ b/databases/mysql60-scripts/Makefile
@@ -10,13 +10,12 @@ PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
 
-MASTERDIR=	${.CURDIR}/../mysql51-server
+MASTERDIR=	${.CURDIR}/../mysql60-server
 
 PKGINSTALL=	mustnotexist
 PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
-USE_PERL5=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 7054148353c3..2a957d6df8b8 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.26
+PORTVERSION=	6.0.5
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.1
+MASTER_SITE_SUBDIR=	MySQL-6.0
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
+DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
+SLAVEDIRS=	databases/mysql60-client databases/mysql60-scripts
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
@@ -48,6 +48,9 @@ CONFIGURE_ARGS+=--with-ssl=bundled
 .if defined(WITH_FAST_MUTEXES)
 CONFIGURE_ARGS+=--with-fast-mutexes
 .endif
+.if defined(WITH_THREAD_POOL)
+CONFIGURE_ARGS+=--with-libevent
+.endif
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
@@ -87,11 +90,11 @@ CXXFLAGS+=	-fno-exceptions
 # MySQL-Server part
 .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	51
+WANT_MYSQL_VER=	60
 
-LATEST_LINK=	mysql51-server
+LATEST_LINK=	mysql60-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -118,6 +121,7 @@ pre-fetch:
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
 	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
 	@${ECHO} "				(try it if you use libpthread)."
+	@${ECHO} "	WITH_THREAD_POOL=yes	Use libevent to have connection pooling."
 	@${ECHO} "	WITH_FAST_MUTEXES=yes	Replace mutexes with spinlocks."
 	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
 	@${ECHO} "				(use it if you need speed)."
@@ -132,7 +136,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
+	@${REINPLACE_CMD} -e "s|install-data-am: install-includeHEADERS|install-data-am:|g" ${WRKSRC}/extra/libevent/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|PROGRAMS = \$$(noinst_PROGRAMS)|PROGRAMS =|g" ${WRKSRC}/storage/archive/Makefile.in
 	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
@@ -147,9 +153,9 @@ post-install:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql51-client
+LATEST_LINK=	mysql60-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.*
 
 MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -174,17 +180,17 @@ post-install:
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	51
+WANT_MYSQL_VER=	60
 USE_PERL5=	yes
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql51
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql60
 .if ${PERL_LEVEL} <= 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-LATEST_LINK=	mysql51-scripts
+LATEST_LINK=	mysql60-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.*
 
 MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
 		mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 3eb87b2c9e38..93933f8670bb 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.26-rc.tar.gz) = db4b30ef40493e0bfe9ca17dd8220cf5
-SHA256 (mysql-5.1.26-rc.tar.gz) = 3a782d85b1aa5b2a47e67e80021e022c06c9d429f8afbc6cde1333d0bcb97dc6
-SIZE (mysql-5.1.26-rc.tar.gz) = 28111441
+MD5 (mysql-6.0.5-alpha.tar.gz) = 8e637e3c0c9d10645a9f188094bf6709
+SHA256 (mysql-6.0.5-alpha.tar.gz) = 0834a1c731905b10fdc5099ef395dd38b38b0a2ee28eb725cf4614f50ecf84ce
+SIZE (mysql-6.0.5-alpha.tar.gz) = 29979599
diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
index bea65ccf9521..79d4eb1b41c9 100644
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ b/databases/mysql60-server/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-01-29 22:44:32.000000000 +0100
-+++ Makefile.in	2008-02-14 08:23:39.000000000 +0100
-@@ -398,14 +398,7 @@
+--- Makefile.in.orig	2008-06-12 15:27:07.000000000 +0200
++++ Makefile.in	2008-07-25 08:10:32.000000000 +0200
+@@ -419,14 +419,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
@@ -10,7 +10,7 @@
 -			@sql_union_dirs@ unittest storage plugin \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
--			mysql-test support-files sql-bench @tools_dirs@ \
+-			mysql-test support-files sql-bench \
 -			win
 +SUBDIRS =
  
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 8d320523e2fc..3700a8a5d249 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -19,6 +19,7 @@ bin/mysqld_safe
 %%NDB%%bin/ndb_print_backup_file
 %%NDB%%bin/ndb_print_schema_file
 %%NDB%%bin/ndb_print_sys_file
+%%NDB%%bin/ndb_redo_log_reader
 %%NDB%%bin/ndb_restore
 %%NDB%%bin/ndb_select_all
 %%NDB%%bin/ndb_select_count
@@ -50,6 +51,7 @@ bin/resolveip
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbInterpretedCode.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
 %%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
@@ -80,7 +82,6 @@ libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
 %%NDB%%libexec/ndbd
-%%DATADIR%%/ChangeLog
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 19c3949a63c4..76ee7f4d68a9 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -37,6 +37,8 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_ftparser.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
 include/mysql/sslopt-case.h
diff --git a/databases/p5-DBD-mysql60/Makefile b/databases/p5-DBD-mysql60/Makefile
index 1a454c065b56..7a0be0ec5526 100644
--- a/databases/p5-DBD-mysql60/Makefile
+++ b/databases/p5-DBD-mysql60/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	51
+PKGNAMESUFFIX=	60
 
-COMMENT=	MySQL 5.1 driver for the Perl5 Database Interface (DBI)
+COMMENT=	MySQL 6.0 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql50-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]*
 
-WANT_MYSQL_VER=	51
+WANT_MYSQL_VER=	60
 
 MASTERDIR=	${.CURDIR}/../p5-DBD-mysql