Changes 5.1.67:

Bug fixes
http://dev.mysql.com/doc/relnotes/mysql/5.1/en/news-5-1-67.html

6 files changed, 23 insertions, 26 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 838a687fc66..eeab10cf81c 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2013/01/15 15:19:37 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2013/01/21 08:58:43 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
-SVR4_PKGNAME=		mysqc
-COMMENT=		MySQL 5, a free SQL database (client)
+PKGNAME=	${DISTNAME:S/-/-client-/}
+SVR4_PKGNAME=	mysqc
+COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
 
diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index a2cc5e81232..f648259d1a1 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.26 2012/09/15 14:48:57 obache Exp $
+# $NetBSD: Makefile.common,v 1.27 2013/01/21 08:58:43 adam Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
 
-DISTNAME=	mysql-5.1.65
+DISTNAME=	mysql-5.1.67
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.1/}
 
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 835e801e3db..e905da1e570 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.23 2012/09/15 14:48:57 obache Exp $
+$NetBSD: distinfo,v 1.24 2013/01/21 08:58:43 adam Exp $
 
-SHA1 (mysql-5.1.65.tar.gz) = 9af3740d0a9f3fb2a9423500dd298b423867cf6e
-RMD160 (mysql-5.1.65.tar.gz) = f777be188656bf5ff4c486e2ecf8faf7f9969d99
-Size (mysql-5.1.65.tar.gz) = 24673939 bytes
+SHA1 (mysql-5.1.67.tar.gz) = f1a7854701a1146b109c30d61236802523969b8d
+RMD160 (mysql-5.1.67.tar.gz) = 5d4412988f50b1f44b4d7a83b943f0804626894e
+Size (mysql-5.1.67.tar.gz) = 24781885 bytes
 SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
 SHA1 (patch-ab) = a1c699ebd9dc7e2cec9354035cbd9fdc2a411175
 SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
 SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
-SHA1 (patch-ae) = e1d9051555e331ccc5d74295780a0b8c47c63ced
-SHA1 (patch-af) = cc6cd10021b63564b893b02e1967d3c470f0e0b2
+SHA1 (patch-ae) = 1bcec45f4cd221ba6e1d176caf01dbd3b3dbfa88
+SHA1 (patch-af) = 6f310d2e033999bf2637659223bdd787f3954884
 SHA1 (patch-ag) = 20e4f5ac5e7b7927339b8c46329533f29a3df56f
 SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b
 SHA1 (patch-ai) = 625474e24c6f6c7b921ffd1534fd2ff93fdf02c8
@@ -21,7 +21,7 @@ SHA1 (patch-ap) = 8d27b99a54071dce99f3b287676ed88c93028cc0
 SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3
 SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211
 SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6
-SHA1 (patch-at) = c192492ef048399da01ea191586808319ce21dc5
+SHA1 (patch-at) = b51e9044727447065cef267a469c481b66ccf64c
 SHA1 (patch-au) = e454e1a4f4232e57f2105ac5150e1df0be709864
 SHA1 (patch-av) = b8fb1065d7e71522374a16d759d2f3ab5227f590
 SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
diff --git a/databases/mysql51-client/patches/patch-ae b/databases/mysql51-client/patches/patch-ae
index 6cbee0676da..cb9178852b9 100644
--- a/databases/mysql51-client/patches/patch-ae
+++ b/databases/mysql51-client/patches/patch-ae
@@ -1,12 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2011/12/02 14:25:10 adam Exp $
+$NetBSD: patch-ae,v 1.4 2013/01/21 08:58:44 adam Exp $
 
-* Portability: include <bstring.h> if exists.
-
---- client/mysqlbinlog.cc.orig	2011-10-29 18:09:49.000000000 +0000
+--- client/mysqlbinlog.cc.orig	2012-12-13 10:05:51.000000000 +0000
 +++ client/mysqlbinlog.cc
-@@ -37,6 +37,9 @@
- #include "log_event.h"
+@@ -38,6 +38,9 @@
  #include "sql_common.h"
+ #include "my_dir.h"
  #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 +#ifdef NEEDS_BSTRING_H
 +#include <bstring.h> /* defines bzero() */
diff --git a/databases/mysql51-client/patches/patch-af b/databases/mysql51-client/patches/patch-af
index f313632dd8d..73ca67a0d72 100644
--- a/databases/mysql51-client/patches/patch-af
+++ b/databases/mysql51-client/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.2 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-af,v 1.3 2013/01/21 08:58:44 adam Exp $
 
 * Portability: include <bstring.h> if exists.
 
 --- client/sql_string.cc.orig	2010-02-04 11:36:53.000000000 +0000
 +++ client/sql_string.cc
-@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
+@@ -39,6 +39,10 @@ extern void sql_element_free(void *ptr);
  
  #include "sql_string.h"
  
diff --git a/databases/mysql51-client/patches/patch-at b/databases/mysql51-client/patches/patch-at
index ab84fdccad7..a357acacd8d 100644
--- a/databases/mysql51-client/patches/patch-at
+++ b/databases/mysql51-client/patches/patch-at
@@ -1,13 +1,13 @@
-$NetBSD: patch-at,v 1.2 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-at,v 1.3 2013/01/21 08:58:44 adam Exp $
 
 * Portability: include <bstring.h> if exists.
 
---- sql/log_event.cc.orig	2010-02-04 11:39:50.000000000 +0000
+--- sql/log_event.cc.orig	2012-12-13 10:05:51.000000000 +0000
 +++ sql/log_event.cc
-@@ -32,6 +32,9 @@
- #include "rpl_utility.h"
+@@ -35,6 +35,9 @@
  #include "rpl_record.h"
  #include <my_dir.h>
+ #include "sql_show.h"    // append_identifier
 +#ifdef NEEDS_BSTRING_H
 +#include <bstring.h> /* defines bcmp() */
 +#endif