Changes 5.5.16:

* The default thread-handling model in MySQL Server executes statements using
  one thread per client connection.
* Commercial distributions of MySQL now include two plugins that enable MySQL
  Server to use external authentication methods to authenticate MySQL users
* Important Change: Replication: The RESET SLAVE statement has been extended
  with an ALL keyword.
* A new utility, mysql_plugin, enables MySQL administrators to manage which
  plugins a MySQL server loads.
* Bugs fixed.

5 files changed, 28 insertions, 24 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index dcaa7f5ace0..b51e2f725a6 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2011/07/28 08:10:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2011/09/16 07:13:47 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.15
+DISTNAME=	mysql-5.5.16
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/PLIST b/databases/mysql55-client/PLIST
index a6aa6908fa2..b1c3a4c858e 100644
--- a/databases/mysql55-client/PLIST
+++ b/databases/mysql55-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/07/08 09:32:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/09/16 07:13:47 adam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_client_test
@@ -7,6 +7,7 @@ bin/mysql_convert_table_format
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_install_db
+bin/mysql_plugin
 bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_upgrade
@@ -105,6 +106,7 @@ man/man1/mysql_convert_table_format.1
 man/man1/mysql_find_rows.1
 man/man1/mysql_fix_extensions.1
 man/man1/mysql_install_db.1
+man/man1/mysql_plugin.1
 man/man1/mysql_secure_installation.1
 man/man1/mysql_setpermission.1
 man/man1/mysql_tzinfo_to_sql.1
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index d61726a8261..5ce6dcfd285 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/08/25 04:37:17 adam Exp $
+$NetBSD: distinfo,v 1.7 2011/09/16 07:13:47 adam Exp $
 
-SHA1 (mysql-5.5.15.tar.gz) = c89be9fe209d74b62a5e5e71e099dad1e0674a87
-RMD160 (mysql-5.5.15.tar.gz) = 536bdcc576583b2ca5b937c1db237dab02453237
-Size (mysql-5.5.15.tar.gz) = 23774015 bytes
+SHA1 (mysql-5.5.16.tar.gz) = 1a3372f9179bfc21cba0005c339a72f8e1458483
+RMD160 (mysql-5.5.16.tar.gz) = c1581d56b3bf254077c709375e7ae48a21748be1
+Size (mysql-5.5.16.tar.gz) = 23816508 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 5e990e40e1e8a5d558315a38b6596c8fa4227e7b
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -16,7 +16,6 @@ SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
 SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
 SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
 SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
-SHA1 (patch-mysys_my_init.c) = 638f45648b3e62beac6c571d0847ec09da091d45
 SHA1 (patch-mysys_stacktrace.c) = c7633ab86f02e345e95564536882e09a9ef19f8d
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
 SHA1 (patch-scripts_mysqld_safe.sh) = 74879fe38b74e3a51db1dd1233b29a05e9edad28
diff --git a/databases/mysql55-client/patches/patch-mysys_my_init.c b/databases/mysql55-client/patches/patch-mysys_my_init.c
deleted file mode 100644
index 2238e5a1d4f..00000000000
--- a/databases/mysql55-client/patches/patch-mysys_my_init.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mysys_my_init.c,v 1.1 2011/08/25 04:37:18 adam Exp $
-
-Fix for Max OS X 10.7 where pthread_init() exists, but isn't a public interface.
-
---- mysys/my_init.c.orig	2011-08-25 04:24:59.000000000 +0000
-+++ mysys/my_init.c
-@@ -99,7 +99,7 @@ my_bool my_init(void)
-   fastmutex_global_init();              /* Must be called early */
- #endif
- 
--#if defined(HAVE_PTHREAD_INIT)
-+#if defined(HAVE_PTHREAD_INIT) && !defined(__APPLE__)
-   pthread_init();			/* Must be called before DBUG_ENTER */
- #endif
- 
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index 4a3b1ca1e08..5f3cfd06371 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/07/28 08:10:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/09/16 07:13:48 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -6,6 +6,7 @@ bin/myisamchk
 bin/myisamlog
 bin/myisampack
 ${PLIST.embedded}bin/mysql_client_test_embedded
+${PLIST.embedded}bin/mysql_embedded
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 ${PLIST.embedded}bin/mysqltest_embedded
@@ -20,6 +21,7 @@ lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 ${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_example.so
@@ -333,6 +335,8 @@ share/mysql/test/include/ctype_numconv.inc
 share/mysql/test/include/ctype_regex.inc
 share/mysql/test/include/ctype_utf8_table.inc
 share/mysql/test/include/ctype_utf8mb4.inc
+share/mysql/test/include/daemon_example_bad_format.ini
+share/mysql/test/include/daemon_example_bad_soname.ini
 share/mysql/test/include/ddl_i18n.check_events.inc
 share/mysql/test/include/ddl_i18n.check_sp.inc
 share/mysql/test/include/ddl_i18n.check_triggers.inc
@@ -1010,6 +1014,7 @@ share/mysql/test/r/mysql_cp932.result
 share/mysql/test/r/mysql_embedded.result
 share/mysql/test/r/mysql_locale_posix.result
 share/mysql/test/r/mysql_not_windows.result
+share/mysql/test/r/mysql_plugin.result
 share/mysql/test/r/mysql_protocols.result
 share/mysql/test/r/mysql_upgrade.result
 share/mysql/test/r/mysql_upgrade_ssl.result
@@ -3926,6 +3931,7 @@ share/mysql/test/suite/rpl/r/rpl_row_blob_innodb.result
 share/mysql/test/suite/rpl/r/rpl_row_blob_myisam.result
 share/mysql/test/suite/rpl/r/rpl_row_colSize.result
 share/mysql/test/suite/rpl/r/rpl_row_conflicts.result
+share/mysql/test/suite/rpl/r/rpl_row_corruption.result
 share/mysql/test/suite/rpl/r/rpl_row_create_table.result
 share/mysql/test/suite/rpl/r/rpl_row_delayed_ins.result
 share/mysql/test/suite/rpl/r/rpl_row_drop.result
@@ -4290,6 +4296,8 @@ share/mysql/test/suite/rpl/t/rpl_row_blob_innodb.test
 share/mysql/test/suite/rpl/t/rpl_row_blob_myisam.test
 share/mysql/test/suite/rpl/t/rpl_row_colSize.test
 share/mysql/test/suite/rpl/t/rpl_row_conflicts.test
+share/mysql/test/suite/rpl/t/rpl_row_corruption-slave.opt
+share/mysql/test/suite/rpl/t/rpl_row_corruption.test
 share/mysql/test/suite/rpl/t/rpl_row_create_table.test
 share/mysql/test/suite/rpl/t/rpl_row_delayed_ins.test
 share/mysql/test/suite/rpl/t/rpl_row_drop.test
@@ -4627,6 +4635,7 @@ share/mysql/test/suite/sys_vars/r/innodb_doublewrite_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_format_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_format_check_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_file_format_max_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_io_threads_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_per_table_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
@@ -4648,11 +4657,14 @@ share/mysql/test/suite/sys_vars/r/innodb_old_blocks_time_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_open_files_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_purge_threads_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_read_ahead_threshold_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_read_io_threads_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_replication_delay_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_rollback_segments_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_stats_method_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_strict_mode_basic.result
@@ -5088,6 +5100,7 @@ share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_format_check_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_file_format_max_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_io_threads_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_per_table_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
@@ -5109,11 +5122,14 @@ share/mysql/test/suite/sys_vars/t/innodb_old_blocks_time_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_open_files_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_purge_batch_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_purge_threads_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_read_ahead_threshold_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_read_io_threads_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_replication_delay_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_rollback_segments_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_stats_method_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_strict_mode_basic.test
@@ -5825,6 +5841,8 @@ share/mysql/test/t/mysql_delimiter_source.sql
 share/mysql/test/t/mysql_embedded.test
 share/mysql/test/t/mysql_locale_posix.test
 share/mysql/test/t/mysql_not_windows.test
+share/mysql/test/t/mysql_plugin-master.opt
+share/mysql/test/t/mysql_plugin.test
 share/mysql/test/t/mysql_protocols.test
 share/mysql/test/t/mysql_upgrade.test
 share/mysql/test/t/mysql_upgrade_ssl.test