Update to 5.1.22 RC release.

15 files changed, 145 insertions, 25 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index f696c21399a0..80713448d2be 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.21
+PORTVERSION=	5.1.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 40b5880fe8ab..fc4e16e39f3b 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
-SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
-SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
+MD5 (mysql-5.1.22-rc.tar.gz) = 87be813d1b2d76b1c756de0a16fa29fb
+SHA256 (mysql-5.1.22-rc.tar.gz) = 1bce64c7e8fe476828644cbc05157fc84fe02e9c13379d1611fbd7d27c0721ec
+SIZE (mysql-5.1.22-rc.tar.gz) = 28662040
diff --git a/databases/mysql51-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql51-server/files/patch-scripts_mysqld_safe.sh
new file mode 100644
index 000000000000..2a30469922f0
--- /dev/null
+++ b/databases/mysql51-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index f696c21399a0..80713448d2be 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.21
+PORTVERSION=	5.1.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 40b5880fe8ab..fc4e16e39f3b 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
-SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
-SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
+MD5 (mysql-5.1.22-rc.tar.gz) = 87be813d1b2d76b1c756de0a16fa29fb
+SHA256 (mysql-5.1.22-rc.tar.gz) = 1bce64c7e8fe476828644cbc05157fc84fe02e9c13379d1611fbd7d27c0721ec
+SIZE (mysql-5.1.22-rc.tar.gz) = 28662040
diff --git a/databases/mysql54-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql54-server/files/patch-scripts_mysqld_safe.sh
new file mode 100644
index 000000000000..2a30469922f0
--- /dev/null
+++ b/databases/mysql54-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index f696c21399a0..80713448d2be 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.21
+PORTVERSION=	5.1.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 40b5880fe8ab..fc4e16e39f3b 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
-SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
-SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
+MD5 (mysql-5.1.22-rc.tar.gz) = 87be813d1b2d76b1c756de0a16fa29fb
+SHA256 (mysql-5.1.22-rc.tar.gz) = 1bce64c7e8fe476828644cbc05157fc84fe02e9c13379d1611fbd7d27c0721ec
+SIZE (mysql-5.1.22-rc.tar.gz) = 28662040
diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
new file mode 100644
index 000000000000..2a30469922f0
--- /dev/null
+++ b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index f696c21399a0..80713448d2be 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.21
+PORTVERSION=	5.1.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 40b5880fe8ab..fc4e16e39f3b 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
-SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
-SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
+MD5 (mysql-5.1.22-rc.tar.gz) = 87be813d1b2d76b1c756de0a16fa29fb
+SHA256 (mysql-5.1.22-rc.tar.gz) = 1bce64c7e8fe476828644cbc05157fc84fe02e9c13379d1611fbd7d27c0721ec
+SIZE (mysql-5.1.22-rc.tar.gz) = 28662040
diff --git a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh
new file mode 100644
index 000000000000..2a30469922f0
--- /dev/null
+++ b/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index f696c21399a0..80713448d2be 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.21
+PORTVERSION=	5.1.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 40b5880fe8ab..fc4e16e39f3b 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.21-beta.tar.gz) = c8e428a526b21d53c494a75b0ee01ffb
-SHA256 (mysql-5.1.21-beta.tar.gz) = 7a63307446736692a2908fdb67d9f1b6fe1bfa3206f5686f1b12fc8d698fda58
-SIZE (mysql-5.1.21-beta.tar.gz) = 28306579
+MD5 (mysql-5.1.22-rc.tar.gz) = 87be813d1b2d76b1c756de0a16fa29fb
+SHA256 (mysql-5.1.22-rc.tar.gz) = 1bce64c7e8fe476828644cbc05157fc84fe02e9c13379d1611fbd7d27c0721ec
+SIZE (mysql-5.1.22-rc.tar.gz) = 28662040
diff --git a/databases/percona55-server/files/patch-scripts_mysqld_safe.sh b/databases/percona55-server/files/patch-scripts_mysqld_safe.sh
new file mode 100644
index 000000000000..2a30469922f0
--- /dev/null
+++ b/databases/percona55-server/files/patch-scripts_mysqld_safe.sh
@@ -0,0 +1,24 @@
+--- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
++++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
+@@ -242,10 +242,10 @@
+ 
+ if test -z "$MYSQL_HOME"
+ then 
+-  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
++  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
+   then
+     log_error "WARNING: Found two instances of my.cnf -
+-$MY_BASEDIR_VERSION/my.cnf and
++$MY_BASEDIR_VERSION/etc/my.cnf and
+ $DATADIR/my.cnf
+ IGNORING $DATADIR/my.cnf"
+ 
+@@ -254,7 +254,7 @@
+   then
+     log_error "WARNING: Found $DATADIR/my.cnf
+ The data directory is a deprecated location for my.cnf, please move it to
+-$MY_BASEDIR_VERSION/my.cnf"
++$MY_BASEDIR_VERSION/etc/my.cnf"
+     MYSQL_HOME=$DATADIR
+   else
+     MYSQL_HOME=$MY_BASEDIR_VERSION