Changes 5.5.29:

* The SHOW AUTHORS and SHOW CONTRIBUTORS statements are now deprecated in MySQL 5.5 and have been removed in MySQL 5.6.
* Bugs Fixed

5 files changed, 32 insertions, 30 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 064ec73fc3b..5e33070246c 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/12/22 10:56:14 tron Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/03 21:23:04 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	2
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index d991460f062..3e046b58196 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.23 2012/10/02 21:25:22 asau Exp $
+# $NetBSD: Makefile.common,v 1.24 2013/01/03 21:23:04 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.28
+DISTNAME=	mysql-5.5.29
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 855eb87ff8e..1d841c5e297 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2012/10/01 15:54:40 adam Exp $
+$NetBSD: distinfo,v 1.20 2013/01/03 21:23:04 adam Exp $
 
-SHA1 (mysql-5.5.28.tar.gz) = 7b029e61db68866eeea0bec40d47fcdced30dd36
-RMD160 (mysql-5.5.28.tar.gz) = dbd2a75a2b55e54f5216d0ea1376b97fd7a107de
-Size (mysql-5.5.28.tar.gz) = 24739429 bytes
+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 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = fc3d3854090ac19dec28ed03b41d78069304f23d
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -20,7 +20,7 @@ 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) = 1c4088b367fc300c669d763a1124d8eed4202e18
+SHA1 (patch-sql_log_event.cc) = 3cd966ea4879a6ee9d88b63dfe33d1b00836994f
 SHA1 (patch-sql_log_event.h) = eb9e38bbf50914ee504501b0723b57f80849ef48
 SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c
 SHA1 (patch-sql_sql_string.cc) = 00368733072803d59473410badb82e92673de0a7
diff --git a/databases/mysql55-client/patches/patch-sql_log_event.cc b/databases/mysql55-client/patches/patch-sql_log_event.cc
index 50cff2c2e64..c592ec19b54 100644
--- a/databases/mysql55-client/patches/patch-sql_log_event.cc
+++ b/databases/mysql55-client/patches/patch-sql_log_event.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-sql_log_event.cc,v 1.2 2012/10/01 15:54:40 adam Exp $
+$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	2011-03-09 15:11:38.000000000 +0000
+--- sql/log_event.cc.orig	2012-12-10 06:16:24.000000000 +0000
 +++ sql/log_event.cc
-@@ -45,6 +45,9 @@
- #include "rpl_record.h"
+@@ -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
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 9ece5196735..ec05345ba70 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2012/10/01 15:54:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2013/01/03 21:23:04 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -214,6 +214,7 @@ share/mysql/test/extra/binlog_tests/implicit.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/check_type.inc
 share/mysql/test/extra/rpl_tests/create_recursive_construct.inc
 share/mysql/test/extra/rpl_tests/rpl_EE_err.test
@@ -409,6 +410,7 @@ share/mysql/test/include/have_ndb_extra.inc
 share/mysql/test/include/have_ndbapi_examples.inc
 share/mysql/test/include/have_nodebug.inc
 share/mysql/test/include/have_not_innodb_plugin.inc
+share/mysql/test/include/have_null_audit_plugin.inc
 share/mysql/test/include/have_outfile.inc
 share/mysql/test/include/have_partition.inc
 share/mysql/test/include/have_perfschema.inc
@@ -460,7 +462,6 @@ share/mysql/test/include/mtr_check.sql
 share/mysql/test/include/mtr_warnings.sql
 share/mysql/test/include/mysql_upgrade_preparation.inc
 share/mysql/test/include/mysqlbinlog_have_debug.inc
-share/mysql/test/include/mysqlbinlog_row_engine.inc
 share/mysql/test/include/mysqld--help.inc
 share/mysql/test/include/mysqldump.inc
 share/mysql/test/include/mysqlhotcopy.inc
@@ -1026,15 +1027,8 @@ share/mysql/test/r/mysql_protocols.result
 share/mysql/test/r/mysql_upgrade.result
 share/mysql/test/r/mysql_upgrade_ssl.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/mysqld--defaults-file.result
 share/mysql/test/r/mysqld--help-notwin.result
@@ -1477,6 +1471,13 @@ share/mysql/test/suite/binlog/r/binlog_max_extension.result
 share/mysql/test/suite/binlog/r/binlog_mixed_cache_stat.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
@@ -1550,6 +1551,14 @@ share/mysql/test/suite/binlog/t/binlog_max_extension.test
 share/mysql/test/suite/binlog/t/binlog_mixed_cache_stat.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
@@ -2916,6 +2925,7 @@ share/mysql/test/suite/innodb/r/innodb_bug12902967.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_bug14007649.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
@@ -3028,6 +3038,7 @@ share/mysql/test/suite/innodb/t/innodb_bug12902967.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
@@ -5937,17 +5948,9 @@ share/mysql/test/t/mysql_protocols.test
 share/mysql/test/t/mysql_upgrade.test
 share/mysql/test/t/mysql_upgrade_ssl.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/mysqld--defaults-file.test
 share/mysql/test/t/mysqld--help-notwin.test