Update to 5.1.7 beta release:

- add mysql_upgrade script to update the databases from an earlier (even minor) release

34 files changed, 119 insertions, 64 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 04c0606f385c..5a4b583553bf 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (client)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
diff --git a/databases/mysql51-scripts/Makefile b/databases/mysql51-scripts/Makefile
index 46d6a0ddf815..7aa6e28374ba 100644
--- a/databases/mysql51-scripts/Makefile
+++ b/databases/mysql51-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (scripts)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 31d72dae75fb..45c2fb309c57 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.6
-PORTREVISION?=	2
+PORTVERSION=	5.1.7
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -157,7 +157,7 @@ pre-fetch:
 post-patch:
 	@${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|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade 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
 	@${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
@@ -170,6 +170,7 @@ post-patch:
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 26cafea2ad5c..924fcad15d55 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.6-alpha.tar.gz) = da1e2d40b30373f0cce79a96f58fbf28
-SHA256 (mysql-5.1.6-alpha.tar.gz) = 5882953ec51c0057c07f9bef968c0a51828a5d6aa2736554a5075196a052617e
-SIZE (mysql-5.1.6-alpha.tar.gz) = 17356416
+MD5 (mysql-5.1.7-beta.tar.gz) = 2949350c8719d49fcda5bc4fa8221348
+SHA256 (mysql-5.1.7-beta.tar.gz) = 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+SIZE (mysql-5.1.7-beta.tar.gz) = 17360288
diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in
index dd0d6964ae12..6548d492fc3c 100644
--- a/databases/mysql51-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql51-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/Makefile.in.orig	Mon Feb 27 22:26:54 2006
++++ scripts/Makefile.in	Thu Mar 16 08:04:00 2006
+@@ -342,24 +342,7 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,13 +19,14 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
+-			mysql_upgrade \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -384,7 +368,7 @@
+@@ -392,7 +375,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/mysql51-server/pkg-message b/databases/mysql51-server/pkg-message
new file mode 100644
index 000000000000..7e30302334e6
--- /dev/null
+++ b/databases/mysql51-server/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+
+************************************************************************
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 4b94c36997fd..590f324ee8a9 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -9,6 +9,7 @@ bin/myisampack
 bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
 bin/mysql_waitpid
 bin/mysqld_safe
 %%NDB%%bin/ndb_config
@@ -68,6 +69,7 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libvio.a
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 04c0606f385c..5a4b583553bf 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (client)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
diff --git a/databases/mysql54-scripts/Makefile b/databases/mysql54-scripts/Makefile
index 46d6a0ddf815..7aa6e28374ba 100644
--- a/databases/mysql54-scripts/Makefile
+++ b/databases/mysql54-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (scripts)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 31d72dae75fb..45c2fb309c57 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.6
-PORTREVISION?=	2
+PORTVERSION=	5.1.7
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -157,7 +157,7 @@ pre-fetch:
 post-patch:
 	@${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|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade 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
 	@${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
@@ -170,6 +170,7 @@ post-patch:
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 26cafea2ad5c..924fcad15d55 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.6-alpha.tar.gz) = da1e2d40b30373f0cce79a96f58fbf28
-SHA256 (mysql-5.1.6-alpha.tar.gz) = 5882953ec51c0057c07f9bef968c0a51828a5d6aa2736554a5075196a052617e
-SIZE (mysql-5.1.6-alpha.tar.gz) = 17356416
+MD5 (mysql-5.1.7-beta.tar.gz) = 2949350c8719d49fcda5bc4fa8221348
+SHA256 (mysql-5.1.7-beta.tar.gz) = 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+SIZE (mysql-5.1.7-beta.tar.gz) = 17360288
diff --git a/databases/mysql54-server/files/patch-scripts::Makefile.in b/databases/mysql54-server/files/patch-scripts::Makefile.in
index dd0d6964ae12..6548d492fc3c 100644
--- a/databases/mysql54-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql54-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/Makefile.in.orig	Mon Feb 27 22:26:54 2006
++++ scripts/Makefile.in	Thu Mar 16 08:04:00 2006
+@@ -342,24 +342,7 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,13 +19,14 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
+-			mysql_upgrade \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -384,7 +368,7 @@
+@@ -392,7 +375,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/mysql54-server/pkg-message b/databases/mysql54-server/pkg-message
new file mode 100644
index 000000000000..7e30302334e6
--- /dev/null
+++ b/databases/mysql54-server/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+
+************************************************************************
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 4b94c36997fd..590f324ee8a9 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -9,6 +9,7 @@ bin/myisampack
 bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
 bin/mysql_waitpid
 bin/mysqld_safe
 %%NDB%%bin/ndb_config
@@ -68,6 +69,7 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libvio.a
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 04c0606f385c..5a4b583553bf 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (client)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
diff --git a/databases/mysql55-scripts/Makefile b/databases/mysql55-scripts/Makefile
index 46d6a0ddf815..7aa6e28374ba 100644
--- a/databases/mysql55-scripts/Makefile
+++ b/databases/mysql55-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (scripts)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 31d72dae75fb..45c2fb309c57 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.6
-PORTREVISION?=	2
+PORTVERSION=	5.1.7
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -157,7 +157,7 @@ pre-fetch:
 post-patch:
 	@${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|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade 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
 	@${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
@@ -170,6 +170,7 @@ post-patch:
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 26cafea2ad5c..924fcad15d55 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.6-alpha.tar.gz) = da1e2d40b30373f0cce79a96f58fbf28
-SHA256 (mysql-5.1.6-alpha.tar.gz) = 5882953ec51c0057c07f9bef968c0a51828a5d6aa2736554a5075196a052617e
-SIZE (mysql-5.1.6-alpha.tar.gz) = 17356416
+MD5 (mysql-5.1.7-beta.tar.gz) = 2949350c8719d49fcda5bc4fa8221348
+SHA256 (mysql-5.1.7-beta.tar.gz) = 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+SIZE (mysql-5.1.7-beta.tar.gz) = 17360288
diff --git a/databases/mysql55-server/files/patch-scripts::Makefile.in b/databases/mysql55-server/files/patch-scripts::Makefile.in
index dd0d6964ae12..6548d492fc3c 100644
--- a/databases/mysql55-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql55-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/Makefile.in.orig	Mon Feb 27 22:26:54 2006
++++ scripts/Makefile.in	Thu Mar 16 08:04:00 2006
+@@ -342,24 +342,7 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,13 +19,14 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
+-			mysql_upgrade \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -384,7 +368,7 @@
+@@ -392,7 +375,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/mysql55-server/pkg-message b/databases/mysql55-server/pkg-message
new file mode 100644
index 000000000000..7e30302334e6
--- /dev/null
+++ b/databases/mysql55-server/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+
+************************************************************************
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 4b94c36997fd..590f324ee8a9 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -9,6 +9,7 @@ bin/myisampack
 bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
 bin/mysql_waitpid
 bin/mysqld_safe
 %%NDB%%bin/ndb_config
@@ -68,6 +69,7 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libvio.a
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 04c0606f385c..5a4b583553bf 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (client)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
diff --git a/databases/mysql60-scripts/Makefile b/databases/mysql60-scripts/Makefile
index 46d6a0ddf815..7aa6e28374ba 100644
--- a/databases/mysql60-scripts/Makefile
+++ b/databases/mysql60-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (scripts)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 31d72dae75fb..45c2fb309c57 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.6
-PORTREVISION?=	2
+PORTVERSION=	5.1.7
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -157,7 +157,7 @@ pre-fetch:
 post-patch:
 	@${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|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade 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
 	@${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
@@ -170,6 +170,7 @@ post-patch:
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 26cafea2ad5c..924fcad15d55 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.6-alpha.tar.gz) = da1e2d40b30373f0cce79a96f58fbf28
-SHA256 (mysql-5.1.6-alpha.tar.gz) = 5882953ec51c0057c07f9bef968c0a51828a5d6aa2736554a5075196a052617e
-SIZE (mysql-5.1.6-alpha.tar.gz) = 17356416
+MD5 (mysql-5.1.7-beta.tar.gz) = 2949350c8719d49fcda5bc4fa8221348
+SHA256 (mysql-5.1.7-beta.tar.gz) = 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+SIZE (mysql-5.1.7-beta.tar.gz) = 17360288
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
index dd0d6964ae12..6548d492fc3c 100644
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql60-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/Makefile.in.orig	Mon Feb 27 22:26:54 2006
++++ scripts/Makefile.in	Thu Mar 16 08:04:00 2006
+@@ -342,24 +342,7 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,13 +19,14 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
+-			mysql_upgrade \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -384,7 +368,7 @@
+@@ -392,7 +375,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/mysql60-server/pkg-message b/databases/mysql60-server/pkg-message
new file mode 100644
index 000000000000..7e30302334e6
--- /dev/null
+++ b/databases/mysql60-server/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+
+************************************************************************
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 4b94c36997fd..590f324ee8a9 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -9,6 +9,7 @@ bin/myisampack
 bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
 bin/mysql_waitpid
 bin/mysqld_safe
 %%NDB%%bin/ndb_config
@@ -68,6 +69,7 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libvio.a
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 04c0606f385c..5a4b583553bf 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -14,6 +13,7 @@ COMMENT=	Multithreaded SQL database (client)
 MASTERDIR=	${.CURDIR}/../mysql51-server
 
 PKGINSTALL=	mustnotexist
+PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
 CLIENT_ONLY=	yes
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 31d72dae75fb..45c2fb309c57 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.6
-PORTREVISION?=	2
+PORTVERSION=	5.1.7
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -157,7 +157,7 @@ pre-fetch:
 post-patch:
 	@${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|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade 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
 	@${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
@@ -170,6 +170,7 @@ post-patch:
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .else
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 26cafea2ad5c..924fcad15d55 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.6-alpha.tar.gz) = da1e2d40b30373f0cce79a96f58fbf28
-SHA256 (mysql-5.1.6-alpha.tar.gz) = 5882953ec51c0057c07f9bef968c0a51828a5d6aa2736554a5075196a052617e
-SIZE (mysql-5.1.6-alpha.tar.gz) = 17356416
+MD5 (mysql-5.1.7-beta.tar.gz) = 2949350c8719d49fcda5bc4fa8221348
+SHA256 (mysql-5.1.7-beta.tar.gz) = 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6
+SIZE (mysql-5.1.7-beta.tar.gz) = 17360288
diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in
index dd0d6964ae12..6548d492fc3c 100644
--- a/databases/percona55-server/files/patch-scripts::Makefile.in
+++ b/databases/percona55-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/Makefile.in.orig	Mon Feb 27 22:26:54 2006
++++ scripts/Makefile.in	Thu Mar 16 08:04:00 2006
+@@ -342,24 +342,7 @@
  yassl_libs_with_path = @yassl_libs_with_path@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,13 +19,14 @@
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
+-			mysql_upgrade \
 -			mysqld_multi \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -384,7 +368,7 @@
+@@ -392,7 +375,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
diff --git a/databases/percona55-server/pkg-message b/databases/percona55-server/pkg-message
new file mode 100644
index 000000000000..7e30302334e6
--- /dev/null
+++ b/databases/percona55-server/pkg-message
@@ -0,0 +1,7 @@
+************************************************************************
+
+Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+
+************************************************************************
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 4b94c36997fd..590f324ee8a9 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -9,6 +9,7 @@ bin/myisampack
 bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
 bin/mysql_waitpid
 bin/mysqld_safe
 %%NDB%%bin/ndb_config
@@ -68,6 +69,7 @@ lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.la
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libvio.a