Changes 5.5.30:

Refer to http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-30.html

12 files changed, 45 insertions, 65 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index e61cfe2862a..776f3f5e7af 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2013/02/06 23:20:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/12 20:36:28 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
@@ -29,9 +28,9 @@ REPLACE_PERL+=	scripts/mysqlhotcopy.sh
 # if manual compression is activated. The manual pages won't work otherwise.
 .if defined(MANZ)
 post-install:
-.  for FILE in mysql_client_test_embedded.1 mysqltest_embedded.1
-	${RM} -f ${DESTDIR}${PREFIX}/man/man1/${FILE}
-	${LN} -s ${FILE:S/_embedded//} ${DESTDIR}${PREFIX}/man/man1/${FILE}
+.  for mf in mysql_client_test_embedded.1 mysqltest_embedded.1
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
+	${LN} -s ${mf:S/_embedded//} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mf}
 .  endfor
 .endif
 
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index b69cca5625c..e9a4a4c258d 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.25 2013/02/05 11:01:19 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.26 2013/02/12 20:36:28 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.29
+DISTNAME=	mysql-5.5.30
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 1d841c5e297..3cf40890d82 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.20 2013/01/03 21:23:04 adam Exp $
+$NetBSD: distinfo,v 1.21 2013/02/12 20:36:28 adam Exp $
 
-SHA1 (mysql-5.5.29.tar.gz) = 40e26b193b6ece86ce97896c0c9c524d479e37be
-RMD160 (mysql-5.5.29.tar.gz) = 6e5535d94393b71b21e60816c3d3c65b5f68ba12
-Size (mysql-5.5.29.tar.gz) = 24870769 bytes
+SHA1 (mysql-5.5.30.tar.gz) = d7e31246d29f6ed4a9c4b966d6896bf920b68351
+RMD160 (mysql-5.5.30.tar.gz) = 6d93cf458a732e63e6d2b3939051233bcd0dea0a
+Size (mysql-5.5.30.tar.gz) = 24499036 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = fc3d3854090ac19dec28ed03b41d78069304f23d
-SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
+SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
 SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0
-SHA1 (patch-client_mysqlbinlog.cc) = 53258276d8fd713d2772c9c8c339bfe190b703cc
-SHA1 (patch-client_sql_string.cc) = a798cc083b897c8e76bc590a886c15698a5266fd
+SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
+SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
 SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
 SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
@@ -20,10 +20,9 @@ SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
 SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478
 SHA1 (patch-sql_CMakeLists.txt) = 6cf54ba886f220c8fe7675a0a3acc83257b9f596
-SHA1 (patch-sql_log_event.cc) = 3cd966ea4879a6ee9d88b63dfe33d1b00836994f
-SHA1 (patch-sql_log_event.h) = eb9e38bbf50914ee504501b0723b57f80849ef48
+SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8
 SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c
-SHA1 (patch-sql_sql_string.cc) = 00368733072803d59473410badb82e92673de0a7
+SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141
 SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc
 SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be
-SHA1 (patch-strings_decimal.c) = 4d2a3d8acb3b0af56180f3a1faa8735d692be5b9
+SHA1 (patch-strings_decimal.c) = dafedbfbd71149890f3356f3cafa77d6d0466f0f
diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk
index 464126d097d..5ee144d60fd 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+# $NetBSD: options.mk,v 1.2 2013/02/12 20:36:28 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -8,9 +8,7 @@ PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
 
 .include "../../mk/bsd.options.mk"
 
-###
-### Enable OpenSSL support
-###
+# Enable OpenSSL support
 .if !empty(PKG_OPTIONS:Mssl)
 .	include "../../security/openssl/buildlink3.mk"
 .  if ${OPSYS} == "SunOS"
diff --git a/databases/mysql55-client/patches/patch-client_completion_hash.cc b/databases/mysql55-client/patches/patch-client_completion_hash.cc
index ae4b458be09..47e25fa840e 100644
--- a/databases/mysql55-client/patches/patch-client_completion_hash.cc
+++ b/databases/mysql55-client/patches/patch-client_completion_hash.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-client_completion_hash.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-client_completion_hash.cc,v 1.2 2013/02/12 20:36:28 adam Exp $
 
-* Portability: include <bstring.h> if exists.
+Portability: include <bstring.h> if exists.
 
 --- client/completion_hash.cc.orig	2010-02-04 11:36:51.000000000 +0000
 +++ client/completion_hash.cc
diff --git a/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc
index 9ba47156d4f..ac7385b1e9a 100644
--- a/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc
+++ b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-client_mysqlbinlog.cc,v 1.2 2012/10/01 15:54:40 adam Exp $
+$NetBSD: patch-client_mysqlbinlog.cc,v 1.3 2013/02/12 20:36:28 adam Exp $
 
-* Portability: include <bstring.h> if exists.
+Portability: include <bstring.h> if exists.
 
 --- client/mysqlbinlog.cc.orig	2012-08-29 08:50:46.000000000 +0000
 +++ client/mysqlbinlog.cc
diff --git a/databases/mysql55-client/patches/patch-client_sql_string.cc b/databases/mysql55-client/patches/patch-client_sql_string.cc
index 85d84326591..2188d876363 100644
--- a/databases/mysql55-client/patches/patch-client_sql_string.cc
+++ b/databases/mysql55-client/patches/patch-client_sql_string.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-client_sql_string.cc,v 1.2 2012/10/01 15:54:40 adam Exp $
+$NetBSD: patch-client_sql_string.cc,v 1.3 2013/02/12 20:36:28 adam Exp $
 
-* Portability: include <bstring.h> if exists.
+Portability: include <bstring.h> if exists.
 
 --- client/sql_string.cc.orig	2010-02-04 11:36:53.000000000 +0000
 +++ client/sql_string.cc
diff --git a/databases/mysql55-client/patches/patch-sql_log_event.cc b/databases/mysql55-client/patches/patch-sql_log_event.cc
deleted file mode 100644
index c592ec19b54..00000000000
--- a/databases/mysql55-client/patches/patch-sql_log_event.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sql_log_event.cc,v 1.3 2013/01/03 21:23:04 adam Exp $
-
-* Portability: include <bstring.h> if exists.
-
---- sql/log_event.cc.orig	2012-12-10 06:16:24.000000000 +0000
-+++ sql/log_event.cc
-@@ -46,6 +46,9 @@
- #include "transaction.h"
- #include <my_dir.h>
- #include "sql_show.h"    // append_identifier
-+#ifdef NEEDS_BSTRING_H
-+#include <bstring.h> /* defines bcmp() */
-+#endif
- 
- #endif /* MYSQL_CLIENT */
- 
diff --git a/databases/mysql55-client/patches/patch-sql_log_event.h b/databases/mysql55-client/patches/patch-sql_log_event.h
index a36fcb187fb..13950f7201a 100644
--- a/databases/mysql55-client/patches/patch-sql_log_event.h
+++ b/databases/mysql55-client/patches/patch-sql_log_event.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-sql_log_event.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-sql_log_event.h,v 1.2 2013/02/12 20:36:29 adam Exp $
 
-* Portability: include <bstring.h> if exists.
+Portability: include <bstring.h> if exists.
 
 --- sql/log_event.h.orig	2010-02-04 11:39:50.000000000 +0000
 +++ sql/log_event.h
diff --git a/databases/mysql55-client/patches/patch-sql_sql_string.cc b/databases/mysql55-client/patches/patch-sql_sql_string.cc
deleted file mode 100644
index 1784351a238..00000000000
--- a/databases/mysql55-client/patches/patch-sql_sql_string.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-sql_sql_string.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
-
-* Portability: include <bstring.h> if exists.
-
---- sql/sql_string.cc.orig	2010-02-04 11:39:53.000000000 +0000
-+++ sql/sql_string.cc
-@@ -27,6 +27,10 @@ extern void sql_element_free(void *ptr);
- 
- #include "sql_string.h"
- 
-+#ifdef NEEDS_BSTRING_H
-+#include <bstring.h> /* defines bzero() */
-+#endif
-+
- /*****************************************************************************
- ** String functions
- *****************************************************************************/
diff --git a/databases/mysql55-client/patches/patch-sql_sql_string.h b/databases/mysql55-client/patches/patch-sql_sql_string.h
new file mode 100644
index 00000000000..f1484cdf04f
--- /dev/null
+++ b/databases/mysql55-client/patches/patch-sql_sql_string.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-sql_sql_string.h,v 1.1 2013/02/12 20:36:29 adam Exp $
+
+Portability: include <bstring.h> if exists.
+
+--- sql/sql_string.h.orig	2013-02-12 11:35:13.000000000 +0000
++++ sql/sql_string.h
+@@ -18,6 +18,10 @@
+ 
+ /* This file is originally from the mysql distribution. Coded by monty */
+ 
++#ifdef NEEDS_BSTRING_H
++#include <bstring.h> /* defines bzero() */
++#endif
++
+ #ifdef USE_PRAGMA_INTERFACE
+ #pragma interface			/* gcc class implementation */
+ #endif
diff --git a/databases/mysql55-client/patches/patch-strings_decimal.c b/databases/mysql55-client/patches/patch-strings_decimal.c
index a4ea7713258..e7aaa030ec6 100644
--- a/databases/mysql55-client/patches/patch-strings_decimal.c
+++ b/databases/mysql55-client/patches/patch-strings_decimal.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-strings_decimal.c,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $
+$NetBSD: patch-strings_decimal.c,v 1.2 2013/02/12 20:36:29 adam Exp $
 
-* Portability: include <bstring.h> if exists.
+Portability: include <bstring.h> if exists.
 
 --- strings/decimal.c.orig	2010-02-04 11:40:24.000000000 +0000
 +++ strings/decimal.c