Changes 5.5.30:

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

8 files changed, 27 insertions, 43 deletions

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