Changes 5.5.35:

* Previously, MySQL Server distributions included the MySQL Reference Manual in Info format (the Docs/mysql.info file). Because the license for the manual restricts redistribution, its inclusion in Community packages caused problems for downstream redistributors, such as those who create Linux distributions. Community distributions of MySQL Server no longer include the mysql.info file, to make the repackaging and redistribution process easier (for example, the source tarball and its checksum can be used directly). This change applies to all source and binary Community packaging formats. Commercial (Enterprise) distributions are unchanged.
* A new CMake option, WITH_ASAN, permits enabling address sanitization for compilers that support it.
* Attempts to use the thread_concurrency system variable (which has an effect only for Solaris 8 and earlier) now indicate that it has no effect when that is the case.
* Bugs Fixed

4 files changed, 11 insertions, 10 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 34f22172677..30a47038c54 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2013/09/30 18:26:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.33 2013/12/03 15:40:19 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.34
+DISTNAME=	mysql-5.5.35
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 1113711ba20..ff467e34dd1 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2013/09/30 18:26:38 adam Exp $
+$NetBSD: distinfo,v 1.28 2013/12/03 15:40:19 adam Exp $
 
-SHA1 (mysql-5.5.34.tar.gz) = 4d09b9b685ef9c905ebce9bbaabb9a20391c49c9
-RMD160 (mysql-5.5.34.tar.gz) = d4b723e730a663dbdc649eb8a2e908c902a1db91
-Size (mysql-5.5.34.tar.gz) = 24699724 bytes
+SHA1 (mysql-5.5.35.tar.gz) = ede7015b698bef5ede4c59a7a9d428b2a679ac77
+RMD160 (mysql-5.5.35.tar.gz) = 5bdd8fdeaaefe3c60bc5fc16daf6e19c8b8ca7a4
+Size (mysql-5.5.35.tar.gz) = 21707804 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 03a38aaeb8a..bd8958506ca 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/07/31 18:51:41 adam Exp $
+# $NetBSD: Makefile,v 1.16 2013/12/03 15:40:19 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=	mysqs
@@ -8,7 +8,6 @@ CONFLICTS=	{mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
 .include "../../databases/mysql55-client/Makefile.common"
 
-INFO_FILES=		yes
 CMAKE_ARGS+=		-DWITH_LIBWRAP=ON
 CMAKE_ARGS+=		-DINSTALL_INFODIR=${PKGINFODIR}
 
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 96641eb8171..6a755946ae1 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2013/09/30 18:26:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2013/12/03 15:40:19 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -14,7 +14,6 @@ bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
-info/mysql.info
 ${PLIST.embedded}lib/libmysqld.a
 lib/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
@@ -547,6 +546,7 @@ share/mysql/test/include/rpl_udf.inc
 share/mysql/test/include/running_event_scheduler.inc
 share/mysql/test/include/safe_set_to_maybe_ro_var.inc
 share/mysql/test/include/save_master_pos.inc
+share/mysql/test/include/search_pattern_in_file.inc
 share/mysql/test/include/select_ndb_apply_status.inc
 share/mysql/test/include/set_binlog_format_mixed.sql
 share/mysql/test/include/set_binlog_format_row.sql
@@ -3950,6 +3950,7 @@ share/mysql/test/suite/rpl/r/rpl_loaddatalocal.result
 share/mysql/test/suite/rpl/r/rpl_loadfile.result
 share/mysql/test/suite/rpl/r/rpl_locale.result
 share/mysql/test/suite/rpl/r/rpl_log_pos.result
+share/mysql/test/suite/rpl/r/rpl_lost_events_on_rotate.result
 share/mysql/test/suite/rpl/r/rpl_manual_change_index_file.result
 share/mysql/test/suite/rpl/r/rpl_many_optimize.result
 share/mysql/test/suite/rpl/r/rpl_master_pos_wait.result
@@ -4306,6 +4307,7 @@ share/mysql/test/suite/rpl/t/rpl_loaddatalocal.test
 share/mysql/test/suite/rpl/t/rpl_loadfile.test
 share/mysql/test/suite/rpl/t/rpl_locale.test
 share/mysql/test/suite/rpl/t/rpl_log_pos.test
+share/mysql/test/suite/rpl/t/rpl_lost_events_on_rotate.test
 share/mysql/test/suite/rpl/t/rpl_manual_change_index_file.test
 share/mysql/test/suite/rpl/t/rpl_many_optimize.test
 share/mysql/test/suite/rpl/t/rpl_master_pos_wait.test