Update to 5.1.15 release.

15 files changed, 65 insertions, 55 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index d2f9e38c740b..2296e9681e6f 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.14
+PORTVERSION=	5.1.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -113,7 +113,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
 		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index ec8e313d4c22..5a7c0535152e 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.14-beta.tar.gz) = f02115e98c99558e062adcf2dc305283
-SHA256 (mysql-5.1.14-beta.tar.gz) = 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67
-SIZE (mysql-5.1.14-beta.tar.gz) = 23640648
+MD5 (mysql-5.1.15-beta.tar.gz) = 8c4c114e0dbbdda6822c0c7d7eed4faf
+SHA256 (mysql-5.1.15-beta.tar.gz) = 8ff4f1054060329adb0584cef5c145fbb8ba62b573cb952381e4dc9a9b60ad66
+SIZE (mysql-5.1.15-beta.tar.gz) = 22150362
diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/mysql51-server/files/patch-mysys_default.c
+++ b/databases/mysql51-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
++++ mysys/default.c	Sat Feb  3 17:12:31 2007
+@@ -608,7 +608,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
    *ptr++= "/etc/";
+   *ptr++= "/etc/mysql/";
 +  *ptr++= "%%PREFIX%%/etc/";
++  *ptr++= "%%PREFIX%%/etc/mysql/";
  #endif
 -  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
 -    *ptr++= env;
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index d2f9e38c740b..2296e9681e6f 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.14
+PORTVERSION=	5.1.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -113,7 +113,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
 		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index ec8e313d4c22..5a7c0535152e 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.14-beta.tar.gz) = f02115e98c99558e062adcf2dc305283
-SHA256 (mysql-5.1.14-beta.tar.gz) = 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67
-SIZE (mysql-5.1.14-beta.tar.gz) = 23640648
+MD5 (mysql-5.1.15-beta.tar.gz) = 8c4c114e0dbbdda6822c0c7d7eed4faf
+SHA256 (mysql-5.1.15-beta.tar.gz) = 8ff4f1054060329adb0584cef5c145fbb8ba62b573cb952381e4dc9a9b60ad66
+SIZE (mysql-5.1.15-beta.tar.gz) = 22150362
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
++++ mysys/default.c	Sat Feb  3 17:12:31 2007
+@@ -608,7 +608,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
    *ptr++= "/etc/";
+   *ptr++= "/etc/mysql/";
 +  *ptr++= "%%PREFIX%%/etc/";
++  *ptr++= "%%PREFIX%%/etc/mysql/";
  #endif
 -  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
 -    *ptr++= env;
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index d2f9e38c740b..2296e9681e6f 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.14
+PORTVERSION=	5.1.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -113,7 +113,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
 		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index ec8e313d4c22..5a7c0535152e 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.14-beta.tar.gz) = f02115e98c99558e062adcf2dc305283
-SHA256 (mysql-5.1.14-beta.tar.gz) = 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67
-SIZE (mysql-5.1.14-beta.tar.gz) = 23640648
+MD5 (mysql-5.1.15-beta.tar.gz) = 8c4c114e0dbbdda6822c0c7d7eed4faf
+SHA256 (mysql-5.1.15-beta.tar.gz) = 8ff4f1054060329adb0584cef5c145fbb8ba62b573cb952381e4dc9a9b60ad66
+SIZE (mysql-5.1.15-beta.tar.gz) = 22150362
diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/mysql55-server/files/patch-mysys_default.c
+++ b/databases/mysql55-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
++++ mysys/default.c	Sat Feb  3 17:12:31 2007
+@@ -608,7 +608,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
    *ptr++= "/etc/";
+   *ptr++= "/etc/mysql/";
 +  *ptr++= "%%PREFIX%%/etc/";
++  *ptr++= "%%PREFIX%%/etc/mysql/";
  #endif
 -  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
 -    *ptr++= env;
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index d2f9e38c740b..2296e9681e6f 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.14
+PORTVERSION=	5.1.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -113,7 +113,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
 		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index ec8e313d4c22..5a7c0535152e 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.14-beta.tar.gz) = f02115e98c99558e062adcf2dc305283
-SHA256 (mysql-5.1.14-beta.tar.gz) = 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67
-SIZE (mysql-5.1.14-beta.tar.gz) = 23640648
+MD5 (mysql-5.1.15-beta.tar.gz) = 8c4c114e0dbbdda6822c0c7d7eed4faf
+SHA256 (mysql-5.1.15-beta.tar.gz) = 8ff4f1054060329adb0584cef5c145fbb8ba62b573cb952381e4dc9a9b60ad66
+SIZE (mysql-5.1.15-beta.tar.gz) = 22150362
diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/mysql60-server/files/patch-mysys_default.c
+++ b/databases/mysql60-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
++++ mysys/default.c	Sat Feb  3 17:12:31 2007
+@@ -608,7 +608,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
    *ptr++= "/etc/";
+   *ptr++= "/etc/mysql/";
 +  *ptr++= "%%PREFIX%%/etc/";
++  *ptr++= "%%PREFIX%%/etc/mysql/";
  #endif
 -  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
 -    *ptr++= env;
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index d2f9e38c740b..2296e9681e6f 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.14
+PORTVERSION=	5.1.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -113,7 +113,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
 		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index ec8e313d4c22..5a7c0535152e 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.14-beta.tar.gz) = f02115e98c99558e062adcf2dc305283
-SHA256 (mysql-5.1.14-beta.tar.gz) = 6b4990a784169560fd487d24c69efba1f73662500d0d3132375d8b5cd026bb67
-SIZE (mysql-5.1.14-beta.tar.gz) = 23640648
+MD5 (mysql-5.1.15-beta.tar.gz) = 8c4c114e0dbbdda6822c0c7d7eed4faf
+SHA256 (mysql-5.1.15-beta.tar.gz) = 8ff4f1054060329adb0584cef5c145fbb8ba62b573cb952381e4dc9a9b60ad66
+SIZE (mysql-5.1.15-beta.tar.gz) = 22150362
diff --git a/databases/percona55-server/files/patch-mysys_default.c b/databases/percona55-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/percona55-server/files/patch-mysys_default.c
+++ b/databases/percona55-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Thu May 26 15:26:56 2005
-+++ mysys/default.c	Fri Jun  3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
++++ mysys/default.c	Sat Feb  3 17:12:31 2007
+@@ -608,7 +608,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
-     *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
    *ptr++= "/etc/";
+   *ptr++= "/etc/mysql/";
 +  *ptr++= "%%PREFIX%%/etc/";
++  *ptr++= "%%PREFIX%%/etc/mysql/";
  #endif
 -  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
 -    *ptr++= env;