8 files changed, 84 insertions, 80 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 2cdae397147f..0ea2b295a5a5 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	MySQL-server
-# Date created:				Fri Apr 11 10:06:26 CET 2003
-# Whom:					Alex Dupre <sysadmin@alexdupre.com>
+# Date created:				28 Jan 2006
+# Whom:					Alex Dupre <ale@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.18
+PORTVERSION=	5.1.5
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.0
+MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
+DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql50-client
+SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
@@ -50,8 +51,8 @@ CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(WITHOUT_INNODB)
-CONFIGURE_ARGS+=--without-innodb
+.if !defined(WITHOUT_INNODB)
+CONFIGURE_ARGS+=--with-innodb
 .endif
 .if defined(WITH_ARCHIVE)
 CONFIGURE_ARGS+=--with-archive-storage-engine
@@ -59,6 +60,9 @@ CONFIGURE_ARGS+=--with-archive-storage-engine
 .if defined(WITH_FEDERATED)
 CONFIGURE_ARGS+=--with-federated-storage-engine
 .endif
+.if defined(WITH_PARTITION)
+CONFIGURE_ARGS+=--with-partition
+.endif
 .if defined(WITH_NDB)
 CONFIGURE_ARGS+=--with-ndbcluster
 .endif
@@ -109,11 +113,11 @@ CXXFLAGS+=	-fno-exceptions
 # MySQL-Server part
 .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	50
+WANT_MYSQL_VER=	51
 
-LATEST_LINK=	mysql50-server
+LATEST_LINK=	mysql51-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.*
+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -146,11 +150,12 @@ pre-fetch:
 	@${ECHO} "	WITHOUT_INNODB=yes	Disable support for InnoDB table handler."
 	@${ECHO} "	WITH_ARCHIVE=yes	Enable support for Archive Storage Engine."
 	@${ECHO} "	WITH_FEDERATED=yes	Enable support for Federated Storage Engine."
+	@${ECHO} "	WITH_PARTITION=yes	Enable support for Partition Storage Engine."
 	@${ECHO} "	WITH_NDB=yes		Enable support for NDB Cluster."
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ @mysql_se_dirs@ @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@@ -170,9 +175,9 @@ post-install:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql50-client
+LATEST_LINK=	mysql51-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.*
+CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
 
 MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -187,7 +192,7 @@ CONFIGURE_ARGS+=--without-server
 .if ${OSVERSION} < 500000
 PLIST_SUB+=	ZLIB=""
 .else
-PLIST_SUB+=     ZLIB="@comment "
+PLIST_SUB+=	ZLIB="@comment "
 .endif
 
 post-patch:
@@ -208,17 +213,17 @@ post-install: install-ldconfig-file
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	50
+WANT_MYSQL_VER=	51
 USE_PERL5=	yes
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql51
 .if ${PERL_LEVEL} <= 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-LATEST_LINK=	mysql50-scripts
+LATEST_LINK=	mysql51-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.*
+CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
 
 MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
 		mysqld_multi.1 mysql_fix_privilege_tables.1
@@ -226,7 +231,7 @@ MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
 SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 		mysql_secure_installation mysql_zap mysqlaccess \
 		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-		mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi
+		mysqldumpslow mysql_explain_log mysqld_multi
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index a79459921780..86820e7b0282 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.18.tar.gz) = f18153b0239aaa03fc5a751f2d82cb71
-SHA256 (mysql-5.0.18.tar.gz) = bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a
-SIZE (mysql-5.0.18.tar.gz) = 19169082
+MD5 (mysql-5.1.5-alpha.tar.gz) = b0d36720cd7d59ba709d28effd5eb67b
+SHA256 (mysql-5.1.5-alpha.tar.gz) = 14a2cc2a9be72476d7555f9ba226d3c295940401dd7590cf601d12d2a74069c7
+SIZE (mysql-5.1.5-alpha.tar.gz) = 16767562
diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in
index 01dcfa676ad2..0263e8df0f63 100644
--- a/databases/mysql54-server/files/patch-Makefile.in
+++ b/databases/mysql54-server/files/patch-Makefile.in
@@ -1,15 +1,18 @@
---- Makefile.in.orig	Thu Dec 15 00:34:48 2005
-+++ Makefile.in	Thu Dec 22 15:29:54 2005
-@@ -365,12 +365,7 @@
+--- Makefile.in.orig	Tue Jan 10 12:21:14 2006
++++ Makefile.in	Sat Jan 28 15:55:32 2006
+@@ -360,15 +360,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			@sql_union_dirs@ @mysql_se_dirs@ \
+-			@sql_server@ scripts @man_dirs@ tests \
+-			@mysql_se_plugins@ \
 -			netware @libmysqld_dirs@ \
--			@bench_dirs@ support-files @tools_dirs@
+-			@bench_dirs@ support-files @tools_dirs@ \
+-			plugin
 +SUBDIRS =
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
diff --git a/databases/mysql54-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql54-server/files/patch-ndb::src::mgmclient::main.cpp
deleted file mode 100644
index ef1f6711f469..000000000000
--- a/databases/mysql54-server/files/patch-ndb::src::mgmclient::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ndb/src/mgmclient/main.cpp.orig	Mon Jan 10 15:36:57 2005
-+++ ndb/src/mgmclient/main.cpp	Mon Jan 10 15:37:26 2005
-@@ -122,7 +122,7 @@
-   }
- #ifdef HAVE_READLINE
-   /* Get a line from the user. */
--  line_read = readline (prompt);    
-+  line_read = readline ((char *)prompt);    
-   /* If the line has any text in it, save it on the history. */
-   if (line_read && *line_read)
-     add_history (line_read);
diff --git a/databases/mysql54-server/files/patch-scripts::Makefile.in b/databases/mysql54-server/files/patch-scripts::Makefile.in
index 5e2d4e697ea6..dd0d6964ae12 100644
--- a/databases/mysql54-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql54-server/files/patch-scripts::Makefile.in
@@ -1,8 +1,8 @@
---- scripts/Makefile.in.orig	Sat Jun 11 03:32:05 2005
-+++ scripts/Makefile.in	Thu Jun 16 23:09:08 2005
-@@ -333,24 +333,7 @@
- uname_prog = @uname_prog@
- yassl_dir = @yassl_dir@
+--- scripts/Makefile.in.orig	Tue Jan 10 12:21:25 2006
++++ scripts/Makefile.in	Sat Jan 28 15:59:15 2006
+@@ -336,23 +336,7 @@
+ yassl_libs_with_path = @yassl_libs_with_path@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
@@ -19,14 +19,13 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
--			mysql_tableinfo \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
- EXTRA_SCRIPTS = make_binary_distribution.sh \
- 			make_sharedlib_distribution.sh \
-@@ -380,7 +363,7 @@
+ noinst_SCRIPTS = make_binary_distribution \
+ 			make_sharedlib_distribution \
+@@ -384,7 +368,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index f8dc70e0c995..c1e2a7097ea7 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -17,6 +17,10 @@ bin/mysqld_safe
 %%NDB%%bin/ndb_drop_index
 %%NDB%%bin/ndb_drop_table
 %%NDB%%bin/ndb_mgm
+%%NDB%%bin/ndb_print_backup_file
+%%NDB%%bin/ndb_print_file
+%%NDB%%bin/ndb_print_schema_file
+%%NDB%%bin/ndb_print_sys_file
 %%NDB%%bin/ndb_restore
 %%NDB%%bin/ndb_select_all
 %%NDB%%bin/ndb_select_count
@@ -27,35 +31,37 @@ bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
-%%NDB%%include/mysql/ndb/mgmapi/ndb_logevent.h
-%%NDB%%include/mysql/ndb/mgmapi/ndbd_exit_codes.h
-%%NDB%%include/mysql/ndb/ndb_constants.h
-%%NDB%%include/mysql/ndb/ndb_init.h
-%%NDB%%include/mysql/ndb/ndb_types.h
-%%NDB%%include/mysql/ndb/ndb_version.h
-%%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbApi.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbBlob.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbDictionary.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbError.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbEventOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbPool.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbRecAttr.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbReceiver.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbScanFilter.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbScanOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbTransaction.hpp
-%%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h
-%%NDB%%include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
-%%NDB%%include/mysql/ndb/ndbapi/ndb_opt_defaults.h
-%%NDB%%include/mysql/ndb/ndbapi/ndberror.h
+%%NDB%%bin/test_varpage
+%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h
+%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
+%%NDB%%include/mysql/storage/ndb/ndb_constants.h
+%%NDB%%include/mysql/storage/ndb/ndb_init.h
+%%NDB%%include/mysql/storage/ndb/ndb_types.h
+%%NDB%%include/mysql/storage/ndb/ndb_version.h
+%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
+%%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/NdbOperation.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
+%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
+%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
+%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
@@ -132,9 +138,10 @@ libexec/mysqld
 %%DATADIR%%/spanish/errmsg.sys
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
-%%NDB%%@dirrm include/mysql/ndb/mgmapi
-%%NDB%%@dirrm include/mysql/ndb/ndbapi
-%%NDB%%@dirrm include/mysql/ndb
+%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
+%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
+%%NDB%%@dirrm include/mysql/storage/ndb
+%%NDB%%@dirrm include/mysql/storage
 @dirrmtry include/mysql
 @dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index 15edd1137bee..d8b9ed15a740 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -8,6 +8,7 @@ bin/mysqlcheck
 bin/mysqldump
 bin/mysqlimport
 bin/mysqlshow
+bin/mysqlslap
 bin/mysqltest
 bin/mysqltestmanager-pwgen
 bin/mysqltestmanagerc
@@ -35,6 +36,7 @@ include/mysql/mysql_time.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
+include/mysql/plugin.h
 include/mysql/raid.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
diff --git a/databases/mysql54-server/pkg-plist.scripts b/databases/mysql54-server/pkg-plist.scripts
index f77f27a1839c..6419684159c1 100644
--- a/databases/mysql54-server/pkg-plist.scripts
+++ b/databases/mysql54-server/pkg-plist.scripts
@@ -5,7 +5,6 @@ bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_secure_installation
 bin/mysql_setpermission
-bin/mysql_tableinfo
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqld_multi