Changes 5.1.67:

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

9 files changed, 57 insertions, 57 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
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 86cdbde034d..96f0b72092f 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 21:25:22 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/01/21 08:58:44 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-server-/}
-SVR4_PKGNAME=		mysqs
-COMMENT=		MySQL 5, a free SQL database (server)
+PKGNAME=	${DISTNAME:S/-/-server-/}
+SVR4_PKGNAME=	mysqs
+COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
@@ -85,9 +85,8 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 # Only 'ndb_mgm' needs readline otherwise we only need it to placate the
 # configure script.  As ndb_mgm is only build if the 'ndb-cluster' option
-# is enabled that option sets a full dependency on readline otherwise 
-# make this only a build-time dependency. 
-#
+# is enabled that option sets a full dependency on readline otherwise
+# make this only a build-time dependency.
 BUILDLINK_DEPMETHOD.readline?=	build
 .include "../../devel/readline/buildlink3.mk"
 
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 35ed4984087..4c87848ffb1 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2012/09/15 14:48:57 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2013/01/21 08:58:44 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -115,6 +115,7 @@ share/mysql-test/extra/binlog_tests/innodb_stat.test
 share/mysql-test/extra/binlog_tests/insert_select-binlog.test
 share/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
 share/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test
+share/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
 share/mysql-test/extra/rpl_tests/rpl_EE_err.test
 share/mysql-test/extra/rpl_tests/rpl_auto_increment.test
 share/mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test
@@ -313,7 +314,6 @@ share/mysql-test/include/mix2_ucs2.inc
 share/mysql-test/include/mtr_check.sql
 share/mysql-test/include/mtr_warnings.sql
 share/mysql-test/include/mysqlbinlog_have_debug.inc
-share/mysql-test/include/mysqlbinlog_row_engine.inc
 share/mysql-test/include/mysqldump.inc
 share/mysql-test/include/mysqlhotcopy.inc
 share/mysql-test/include/mysqltest-x.inc
@@ -809,15 +809,8 @@ share/mysql-test/r/mysql_cp932.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysql_upgrade.result
 share/mysql-test/r/mysqladmin.result
-share/mysql-test/r/mysqlbinlog-cp932.result
 share/mysql-test/r/mysqlbinlog.result
-share/mysql-test/r/mysqlbinlog2.result
-share/mysql-test/r/mysqlbinlog_base64.result
-share/mysql-test/r/mysqlbinlog_row.result
 share/mysql-test/r/mysqlbinlog_row_big.result
-share/mysql-test/r/mysqlbinlog_row_innodb.result
-share/mysql-test/r/mysqlbinlog_row_myisam.result
-share/mysql-test/r/mysqlbinlog_row_trans.result
 share/mysql-test/r/mysqlcheck.result
 share/mysql-test/r/mysqldump-compat.result
 share/mysql-test/r/mysqldump-max.result
@@ -1218,6 +1211,13 @@ share/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
 share/mysql-test/suite/binlog/r/binlog_mixed_failure_mixing_engines.result
 share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql-test/suite/binlog/r/binlog_multi_engine.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
 share/mysql-test/suite/binlog/r/binlog_old_versions.result
 share/mysql-test/suite/binlog/r/binlog_query_filter_rules.result
 share/mysql-test/suite/binlog/r/binlog_reset_master.result
@@ -1285,6 +1285,14 @@ share/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test
 share/mysql-test/suite/binlog/t/binlog_mixed_failure_mixing_engines.test
 share/mysql-test/suite/binlog/t/binlog_mixed_load_data.test
 share/mysql-test/suite/binlog/t/binlog_multi_engine.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
 share/mysql-test/suite/binlog/t/binlog_old_versions.test
 share/mysql-test/suite/binlog/t/binlog_query_filter_rules-master.opt
 share/mysql-test/suite/binlog/t/binlog_query_filter_rules.test
@@ -2246,7 +2254,6 @@ share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19.test
 share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test
 share/mysql-test/suite/engines/rr_trx/t/rr_u_4.test
 share/mysql-test/suite/federated/disabled.def
-share/mysql-test/suite/federated/federated.inc
 share/mysql-test/suite/federated/federated.result
 share/mysql-test/suite/federated/federated.test
 share/mysql-test/suite/federated/federated_archive.result
@@ -2257,7 +2264,6 @@ share/mysql-test/suite/federated/federated_bug_25714.result
 share/mysql-test/suite/federated/federated_bug_25714.test
 share/mysql-test/suite/federated/federated_bug_35333.result
 share/mysql-test/suite/federated/federated_bug_35333.test
-share/mysql-test/suite/federated/federated_cleanup.inc
 share/mysql-test/suite/federated/federated_debug-master.opt
 share/mysql-test/suite/federated/federated_debug.result
 share/mysql-test/suite/federated/federated_debug.test
@@ -2272,7 +2278,9 @@ share/mysql-test/suite/federated/federated_server.test
 share/mysql-test/suite/federated/federated_transactions-slave.opt
 share/mysql-test/suite/federated/federated_transactions.result
 share/mysql-test/suite/federated/federated_transactions.test
-share/mysql-test/suite/federated/have_federated_db.inc
+share/mysql-test/suite/federated/include/federated.inc
+share/mysql-test/suite/federated/include/federated_cleanup.inc
+share/mysql-test/suite/federated/include/have_federated_db.inc
 share/mysql-test/suite/federated/my.cnf
 share/mysql-test/suite/funcs_1/README.txt
 share/mysql-test/suite/funcs_1/bitdata/bitdata_master.test
@@ -2668,6 +2676,7 @@ share/mysql-test/suite/innodb/r/innodb_bug12400341.result
 share/mysql-test/suite/innodb/r/innodb_bug12661768.result
 share/mysql-test/suite/innodb/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb/r/innodb_bug13635833.result
+share/mysql-test/suite/innodb/r/innodb_bug14704286.result
 share/mysql-test/suite/innodb/r/innodb_bug21704.result
 share/mysql-test/suite/innodb/r/innodb_bug30423.result
 share/mysql-test/suite/innodb/r/innodb_bug30919.result
@@ -2732,6 +2741,7 @@ share/mysql-test/suite/innodb/t/innodb_bug12661768.test
 share/mysql-test/suite/innodb/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb/t/innodb_bug13635833.test
 share/mysql-test/suite/innodb/t/innodb_bug14007649.test
+share/mysql-test/suite/innodb/t/innodb_bug14704286.test
 share/mysql-test/suite/innodb/t/innodb_bug21704.test
 share/mysql-test/suite/innodb/t/innodb_bug30423.test
 share/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
@@ -2869,6 +2879,7 @@ share/mysql-test/suite/innodb_plugin/r/innodb_cmp_drop_table.result
 share/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
 share/mysql-test/suite/innodb_plugin/r/innodb_gis.result
 share/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
+share/mysql-test/suite/innodb_plugin/r/innodb_information_schema_buffer.result
 share/mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
 share/mysql-test/suite/innodb_plugin/r/innodb_misc1.result
 share/mysql-test/suite/innodb_plugin/r/innodb_multi_update.result
@@ -2975,6 +2986,7 @@ share/mysql-test/suite/innodb_plugin/t/innodb_file_format-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
 share/mysql-test/suite/innodb_plugin/t/innodb_gis.test
 share/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
+share/mysql-test/suite/innodb_plugin/t/innodb_information_schema_buffer.test
 share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql-test/suite/innodb_plugin/t/innodb_lock_wait_timeout_1.test
 share/mysql-test/suite/innodb_plugin/t/innodb_misc1-master.opt
@@ -4748,17 +4760,9 @@ share/mysql-test/t/mysql_delimiter_source.sql
 share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysql_upgrade.test
 share/mysql-test/t/mysqladmin.test
-share/mysql-test/t/mysqlbinlog-cp932-master.opt
-share/mysql-test/t/mysqlbinlog-cp932.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
-share/mysql-test/t/mysqlbinlog2.test
-share/mysql-test/t/mysqlbinlog_base64.test
-share/mysql-test/t/mysqlbinlog_row.test
 share/mysql-test/t/mysqlbinlog_row_big.test
-share/mysql-test/t/mysqlbinlog_row_innodb.test
-share/mysql-test/t/mysqlbinlog_row_myisam.test
-share/mysql-test/t/mysqlbinlog_row_trans.test
 share/mysql-test/t/mysqlcheck.test
 share/mysql-test/t/mysqldump-compat.opt
 share/mysql-test/t/mysqldump-compat.test
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index e5ccdb2c714..9b2cb798b0a 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2012/09/15 14:48:57 obache Exp $
+$NetBSD: distinfo,v 1.27 2013/01/21 08:58:44 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) = 2a5321738e637a56e57cd6b1b40908d2bf275506
 SHA1 (patch-ab) = 4c485a74d55553d63fc3dbc0350d0aa0068e1fcf
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c