Changes 5.6.32:

Bugs Fixed

InnoDB: Full-text search auxiliary tables could be dropped by one session while being access by another.

InnoDB: Selecting full-text index information schema tables for a deleted table caused a segmentation fault.

InnoDB: Rollback of a full-text index synchronization operation raised an assertion. The rollback operation attempted to acquire a mutex still held by the background synchronization thread.

InnoDB: Setting innodb_monitor_enable to all did not enable all counters.

Replication: After issuing a PURGE BINARY LOGS statement, if the binary log index file was not available, for example because it had been opened by another application such as MEB, the server could stop unexpectedly. Although this situation was rare, the handling has been made more robust to avoid unexpected halts and more informative errors are provided.

Replication: When using row-based replication and InnoDB, replication slaves reverted to using an older locking scheme when a transaction had already acquired an AUTOINC lock related to a LOAD FILE or INSERT ... SELECT type of statement, reducing replication slave performance. The fix ensures that sql_command is set correctly for any of the DML events such as WRITE_ROWS_EVENT, UPDATE_EVENT, and DELETE_EVENT.

Replication: A MySQL version 5.5 slave does not have a server_uuid and replication identified servers by their server_id. Starting from MySQL version 5.6, replication masters detected a zombie dump thread based only on a slave's server_uuid value, under the assumption that each slave has a unique UUID. Connecting a MySQL 5.5 slave to a MySQL 5.6 and later master meant that the master was unable to detect zombie dump threads that were created to serve slaves running versions older than MySQL 5.6. The fix ensures that a master now first checks if a slave has a server_uuid set. If it is set, zombie dump thread detection happens based on the slave's UUID. If a slave's server_uuid is not set, zombie dump thread detection happens based on server_id.

Replication: With slave_skip_errors enabled there were still special cases when slave errors were not being correctly ignored. For example:

When opening and locking a table failed.

When field conversions failed on a server running row-based replication.

In these cases the error was considered critical and it was not respecting the state of slave_skip_errors. The fix ensures that with slave_skip_errors enabled, all errors reported during applying a transaction are correctly handled. This means that in such a set up, upon receiving an error with the log_warnings option set to greater than 1, if the error can be ignored then the warning is printed into the error log and the server continues as it does in the case of other ignored errors.

Replication: When using statement-based or mixed binary logging format with --read-only=ON, it was not possible to modify temporary tables.

MySQL Server upgrades performed using RPM packages failed when upgrading from MySQL 5.5 Community to MySQL 5.6 Community or MySQL 5.5 Commercial to MySQL 5.6 Commercial.

The code for reading character set information from Performance Schema statement events tables (for example, events_statements_current) did not prevent simultaneous writing to that information. As a result, the SQL query text character set could be invalid, which could result in a server exit. Now an invalid character set causes SQL_TEXT column truncation.

A buffer overflow in the regex library was fixed.

Certain arguments to NAME_CONST() could cause a server exit.

For unit-testing with the MySQL test suite, the make unit-test command is no longer available. The ctest program should be used instead. See Unit Tests Added to Main Test Runs.

ST_Distance() could raise an assertion for NULL return values.

With the query cache enabled, executing a prepared statement with CURSOR_TYPE_READ_ONLY and then again with CURSOR_TYPE_NO_CURSOR caused the server to return an error.

mysql_real_connect() was not thread-safe when invoked with the MYSQL_READ_DEFAULT_FILE or MYSQL_READ_DEFAULT_GROUP option enabled.

Installing MySQL from a yum or zypper repository resulted in /var/log/mysqld.log being created with incorrect user and group permissions.

If a stored function updated a view for which the view table had a trigger defined that updated another table, it could fail and report an error that an existing table did not exist.

If an INSTALL PLUGIN statement contained invalid UTF-8 characters in the shared library name, it caused the server to hang (or to raise an assertion in debug builds).

For multibyte character sets, LOAD DATA could fail to allocate space correctly and ignore input rows as a result.

7 files changed, 38 insertions, 30 deletions

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 6d9c135c748..fe2790966af 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2016/07/09 06:38:00 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/04 10:09:08 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index ecd1b90cd50..eb83235716b 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.33 2016/06/15 11:30:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2016/08/04 10:09:08 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.31
+DISTNAME=	mysql-5.6.32
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 7795d147a6e..dace1cdf439 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.35 2016/06/15 11:30:39 adam Exp $
+$NetBSD: distinfo,v 1.36 2016/08/04 10:09:08 adam Exp $
 
-SHA1 (mysql-5.6.31.tar.gz) = 9c687f4766bb0085b3d9e518b3a356879b230e58
-RMD160 (mysql-5.6.31.tar.gz) = 4789473f9bcdf00328b9af9306f621a2d179dfb1
-SHA512 (mysql-5.6.31.tar.gz) = dc527e1d3ce7359a86fd91e9469d4ff1bb475c68bbb11aecb2a1897660fc09d0d26a401384117a2ad4e58cd709b5525facabef534e4f7b242119ce171d245cb1
-Size (mysql-5.6.31.tar.gz) = 32098698 bytes
-SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
-RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
-SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
-Size (sphinx-2.2.10-release.tar.gz) = 3109250 bytes
-SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
+SHA1 (mysql-5.6.32.tar.gz) = 8a36b375389fedc691eba2ef6905a95c94f30d4c
+RMD160 (mysql-5.6.32.tar.gz) = 3295ef5f2a5cc937a010ce0f93565e6e04673f58
+SHA512 (mysql-5.6.32.tar.gz) = 5af7aaabc1da7d12d16538c89552179423d7f7e2024bc55e75d2f26c99db4fe339e0a1f605e767f91f40dfecee3bcce31c83499a2278204b0f7f24c3411c0d15
+Size (mysql-5.6.32.tar.gz) = 32095208 bytes
+SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
+RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
+SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
+Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
+SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk
index 00ac02e2f00..13421b54bea 100644
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2015/11/11 11:00:06 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2016/08/04 10:09:08 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -39,9 +39,9 @@ CMAKE_ARGS+=		-DWITH_INNODB_MEMCACHED=OFF
 # http://sphinxsearch.com/docs/current.html#sphinxse-overview
 PLIST_VARS+=	sphinx
 .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-SPHINX_VER=	2.2.10
+SPHINX_VER=	2.2.11
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.10-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.11-release.tar.gz=	http://sphinxsearch.com/files/
 .  if !empty(PKGPATH:Mdatabases/mysql56-server)
 MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .  endif
diff --git a/databases/mysql56-client/patches/patch-CMakeLists.txt b/databases/mysql56-client/patches/patch-CMakeLists.txt
index cd2f38892fb..e4b64ab4811 100644
--- a/databases/mysql56-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql56-client/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2014/08/10 15:11:57 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2016/08/04 10:09:08 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
 
---- CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
+--- CMakeLists.txt.orig	2016-07-11 09:19:51.000000000 +0000
 +++ CMakeLists.txt
-@@ -215,6 +215,7 @@ IF(DISABLE_SHARED)
+@@ -202,6 +202,7 @@ IF(DISABLE_SHARED)
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
@@ -13,15 +13,15 @@ Build with newer DTrace.
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
-@@ -472,7 +473,6 @@ ADD_SUBDIRECTORY(vio)
+@@ -462,7 +463,6 @@ ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
  ADD_SUBDIRECTORY(mysys_ssl)
 -ADD_SUBDIRECTORY(libmysql)
  
  IF(WITH_UNIT_TESTS)
-   ADD_SUBDIRECTORY(unittest)
-@@ -491,16 +491,16 @@ IF(WITH_UNIT_TESTS)
+   # Visual Studio 11 needs this extra flag in order to compile gmock.
+@@ -480,16 +480,16 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -43,7 +43,7 @@ Build with newer DTrace.
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
-@@ -511,7 +511,6 @@ ENDIF()
+@@ -500,7 +500,6 @@ ENDIF()
  
  # scripts/mysql_config depends on client and server targets loaded above.
  # It is referenced by some of the directories below, so we insert it here.
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 4febdf9f67f..afba0136c7a 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2016/06/14 13:23:45 fhajny Exp $
+# $NetBSD: Makefile,v 1.30 2016/08/04 10:09:08 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index a232ef91b9e..5b966559d90 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2016/06/15 11:30:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2016/08/04 10:09:08 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1303,6 +1303,7 @@ share/mysql/test/r/mysql.result
 share/mysql/test/r/mysql_binary_mode.result
 share/mysql/test/r/mysql_client_test.result
 share/mysql/test/r/mysql_client_test_embedded.result
+share/mysql/test/r/mysql_client_test_qcache.result
 share/mysql/test/r/mysql_comments.result
 share/mysql/test/r/mysql_config_editor.result
 share/mysql/test/r/mysql_cp932.result
@@ -1730,6 +1731,7 @@ share/mysql/test/std_data/bug17532932.frm
 share/mysql/test/std_data/bug19371.MYD
 share/mysql/test/std_data/bug19371.MYI
 share/mysql/test/std_data/bug19371.frm
+share/mysql/test/std_data/bug20683959loaddata.txt
 share/mysql/test/std_data/bug30435_10k_items.txt
 share/mysql/test/std_data/bug30435_5k.txt
 share/mysql/test/std_data/bug33029-slave-relay-bin.000001
@@ -1931,6 +1933,7 @@ share/mysql/test/suite/binlog/r/binlog_checksum.result
 share/mysql/test/suite/binlog/r/binlog_crash_safe_master_checksum.result
 share/mysql/test/suite/binlog/r/binlog_database.result
 share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result
+share/mysql/test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result
 share/mysql/test/suite/binlog/r/binlog_drop_if_exists.result
 share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency.result
 share/mysql/test/suite/binlog/r/binlog_error_action.result
@@ -2044,6 +2047,7 @@ share/mysql/test/suite/binlog/t/binlog_crash_safe_master_checksum-master.opt
 share/mysql/test/suite/binlog/t/binlog_crash_safe_master_checksum.test
 share/mysql/test/suite/binlog/t/binlog_database.test
 share/mysql/test/suite/binlog/t/binlog_delete_and_flush_index.test
+share/mysql/test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test
 share/mysql/test/suite/binlog/t/binlog_drop_if_exists.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency.test
 share/mysql/test/suite/binlog/t/binlog_error_action-master.opt
@@ -6276,6 +6280,7 @@ share/mysql/test/suite/rpl/r/rpl_auto_increment_bug33029.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_bug45679.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result
 share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
+share/mysql/test/suite/rpl/r/rpl_autoinc_lock_style.result
 share/mysql/test/suite/rpl/r/rpl_avoid_temporal_upgrade.result
 share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
@@ -6388,7 +6393,6 @@ share/mysql/test/suite/rpl/r/rpl_gtid_server_sighup.result
 share/mysql/test/suite/rpl/r/rpl_gtid_sql_until_before_after.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
 share/mysql/test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
-share/mysql/test/suite/rpl/r/rpl_gtid_stress_failover.result
 share/mysql/test/suite/rpl/r/rpl_gtid_temp_table.result
 share/mysql/test/suite/rpl/r/rpl_gtid_transaction_split_across_relay_logs.result
 share/mysql/test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
@@ -6590,6 +6594,7 @@ share/mysql/test/suite/rpl/r/rpl_row_record_find_myisam.result
 share/mysql/test/suite/rpl/r/rpl_row_reset_slave.result
 share/mysql/test/suite/rpl/r/rpl_row_rollback_to_savepoint.result
 share/mysql/test/suite/rpl/r/rpl_row_show_relaylog_events.result
+share/mysql/test/suite/rpl/r/rpl_row_slave_skip_error_all.result
 share/mysql/test/suite/rpl/r/rpl_row_sp001.result
 share/mysql/test/suite/rpl/r/rpl_row_sp002_innodb.result
 share/mysql/test/suite/rpl/r/rpl_row_sp003.result
@@ -6728,6 +6733,7 @@ share/mysql/test/suite/rpl/r/rpl_variables.result
 share/mysql/test/suite/rpl/r/rpl_variables_stm.result
 share/mysql/test/suite/rpl/r/rpl_view.result
 share/mysql/test/suite/rpl/r/rpl_view_multi.result
+share/mysql/test/suite/rpl/r/rpl_zombie_dump_threads.result
 share/mysql/test/suite/rpl/rpl_1slave_base.cnf
 share/mysql/test/suite/rpl/t/disabled.def
 share/mysql/test/suite/rpl/t/rpl_000010-slave.opt
@@ -6752,6 +6758,7 @@ share/mysql/test/suite/rpl/t/rpl_auto_increment_bug33029.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_bug45679.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_update_failure.test
 share/mysql/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
+share/mysql/test/suite/rpl/t/rpl_autoinc_lock_style.test
 share/mysql/test/suite/rpl/t/rpl_avoid_temporal_upgrade.test
 share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
@@ -6925,8 +6932,6 @@ share/mysql/test/suite/rpl/t/rpl_gtid_server_sighup.test
 share/mysql/test/suite/rpl/t/rpl_gtid_sql_until_before_after.test
 share/mysql/test/suite/rpl/t/rpl_gtid_stm_insert_delayed.test
 share/mysql/test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
-share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.cnf
-share/mysql/test/suite/rpl/t/rpl_gtid_stress_failover.test
 share/mysql/test/suite/rpl/t/rpl_gtid_temp_table.test
 share/mysql/test/suite/rpl/t/rpl_gtid_transaction_split_across_relay_logs.cnf
 share/mysql/test/suite/rpl/t/rpl_gtid_transaction_split_across_relay_logs.test
@@ -7246,6 +7251,8 @@ share/mysql/test/suite/rpl/t/rpl_row_record_find_myisam.test
 share/mysql/test/suite/rpl/t/rpl_row_reset_slave.test
 share/mysql/test/suite/rpl/t/rpl_row_rollback_to_savepoint.test
 share/mysql/test/suite/rpl/t/rpl_row_show_relaylog_events.test
+share/mysql/test/suite/rpl/t/rpl_row_slave_skip_error_all-slave.opt
+share/mysql/test/suite/rpl/t/rpl_row_slave_skip_error_all.test
 share/mysql/test/suite/rpl/t/rpl_row_sp001.test
 share/mysql/test/suite/rpl/t/rpl_row_sp002_innodb.test
 share/mysql/test/suite/rpl/t/rpl_row_sp003.test
@@ -7453,6 +7460,7 @@ share/mysql/test/suite/rpl/t/rpl_variables.test
 share/mysql/test/suite/rpl/t/rpl_variables_stm.test
 share/mysql/test/suite/rpl/t/rpl_view.test
 share/mysql/test/suite/rpl/t/rpl_view_multi.test
+share/mysql/test/suite/rpl/t/rpl_zombie_dump_threads.test
 share/mysql/test/suite/rpl_ndb/my.cnf
 share/mysql/test/suite/rpl_ndb/r/rpl_ndb_UUID.result
 share/mysql/test/suite/rpl_ndb/r/rpl_ndb_blob2.result
@@ -9325,6 +9333,8 @@ share/mysql/test/t/mysql_client_test-master.opt
 share/mysql/test/t/mysql_client_test.test
 share/mysql/test/t/mysql_client_test_embedded.cnf
 share/mysql/test/t/mysql_client_test_embedded.test
+share/mysql/test/t/mysql_client_test_qcache-master.opt
+share/mysql/test/t/mysql_client_test_qcache.test
 share/mysql/test/t/mysql_comments.sql
 share/mysql/test/t/mysql_comments.test
 share/mysql/test/t/mysql_config_editor.test