mysql56-{client,server}: updated to 5.6.43

Changes in MySQL 5.6.43:

Functionality Added or Changed

Microsoft Windows: The access control granted to clients on the named pipe created by the MySQL server now is set to the minimum necessary for successful communication on Windows. Newer MySQL client software can open named pipe connections without any additional configuration. If older client software cannot be upgraded immediately, the new named_pipe_full_access_group server system variable can be used to give a Windows group the necessary permissions to open a named pipe connection. Membership in the full-access group should be restricted and temporary.


Bugs Fixed

Replication: A patch to correct the handling of quotes for identifiers in ROLLBACK TO SAVEPOINT statements in the binary log was not correctly applied to subsequent MySQL versions.

Replication: In some circumstances, the CHANGE MASTER TO statement could not be used on a replication slave if the master info log had been changed from a table (master_info_repository=TABLE) into a file (master_info_repository=FILE).

Replication: The value returned by a SHOW SLAVE STATUS statement for the total combined size of all existing relay log files (Relay_Log_Space) could become much larger than the actual disk space used by the relay log files. The I/O thread did not lock the variable while it updated the value, so the SQL thread could automatically delete a relay log file and write a reduced value before the I/O thread finished updating the value. The I/O thread then wrote its original size calculation, ignoring the SQL thread's update and so adding back the space for the deleted file. The Relay_Log_Space value is now locked during updates to prevent concurrent updates and ensure an accurate calculation.

Replication: If the relay log index file was temporarily locked for viewing by a backup process for a replication slave, and MySQL Server also attempted to access the file at that time for rename or delete operations, the backup completed with warnings, but MySQL Server experienced an unexpected halt. MySQL Server now retries the file access operation a number of times in case this or a similar scenario is the explanation and the file becomes available again before long.

The server permitted creation of databases with the same name as redo log files, which could result in unexpected server behavior. Such names are no longer permitted as database names.

When a subquery contained a UNION, the count of the number of subquery columns was calculated incorrectly.

Comparing log file names as strings using the memcmp() function resulted in uninitialized memory read errors. The comparison now uses the strncmp() function. Thanks to Zsolt Parragi and Laurynas Biveinis for their contributions.

The transformation of IN subquery predicates into semijoins was not handled correctly for a very large number of tables.

Executing a prepared statement to do a multiple-row insert with large number of placeholders consumed excessive memory and could execute slowly.

The parser accepted invalid SET statement syntax in trigger definitions that could result in a server exit.

MyISAM index corruption could occur for bulk-insert and table-repair operations that involve the repair-by-sorting algorithm and many (more than 450 million) rows.

A query employing a dynamic range and an index merge could use more memory than expected.

7 files changed, 26 insertions, 18 deletions

diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 98d8b8281d9..e393265ea87 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2019/01/20 18:04:49 maya Exp $
+# $NetBSD: Makefile,v 1.29 2019/02/05 20:06:06 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 c89a7505f4d..900f3753d5f 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.46 2018/11/22 11:53:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.47 2019/02/05 20:06:06 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.42
+DISTNAME=	mysql-5.6.43
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -61,8 +61,8 @@ CMAKE_ARGS+=		-DINSTALL_SUPPORTFILESDIR="share/mysql"
 CMAKE_ARGS+=		-DMYSQL_DATADIR=${MYSQL_DATADIR}
 
 CMAKE_ARGS+=		-DWITH_ZLIB="system"
-CMAKE_ARGS+=		-DDEFAULT_CHARSET=${MYSQL_CHARSET:Q}
-CMAKE_ARGS+=		-DDEFAULT_COLLATION=${MYSQL_COLLATION:Q}
+CMAKE_ARGS+=		-DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_ARGS+=		-DDEFAULT_COLLATION=${MYSQL_COLLATION}
 CMAKE_ARGS+=		-DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
 
 # MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
diff --git a/databases/mysql56-client/buildlink3.mk b/databases/mysql56-client/buildlink3.mk
index b924d24e6a8..ed113288f36 100644
--- a/databases/mysql56-client/buildlink3.mk
+++ b/databases/mysql56-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/10/02 19:21:30 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/02/05 20:06:06 adam Exp $
 
 BUILDLINK_TREE+=	mysql-client
 
@@ -11,8 +11,13 @@ BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql56-client
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
 BUILDLINK_LIBDIRS.mysql-client?=	lib
 
+pkgbase:=	mysql-client
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../devel/zlib/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.mysql-client:Mssl)
 .include "../../security/openssl/buildlink3.mk"
+.endif
 .endif # MYSQL_CLIENT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-mysql-client
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index cb2658e47d9..11608cad0db 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2019/01/20 18:04:49 maya Exp $
+$NetBSD: distinfo,v 1.50 2019/02/05 20:06:06 adam Exp $
 
-SHA1 (mysql-5.6.42.tar.gz) = 536ca4899d49222d2c105e827f3a366a57a55b0e
-RMD160 (mysql-5.6.42.tar.gz) = ffbe4ceed2e751999077d089819ceb6a27dbeaaa
-SHA512 (mysql-5.6.42.tar.gz) = 3104e6a3145a119f2b012de6af2a92fc37134aa402b889a562f5fc2391705d0bc2f718166c5fa8387d973fff5ecd9544c8b389b6d0c81d98bdcaf2acfb9b55e8
-Size (mysql-5.6.42.tar.gz) = 32201731 bytes
+SHA1 (mysql-5.6.43.tar.gz) = 14fefb6ccceab462f3c0291dabcbd55adc16569d
+RMD160 (mysql-5.6.43.tar.gz) = 9115b626f9ad19eaadb1f81feea97b12ec97d719
+SHA512 (mysql-5.6.43.tar.gz) = 8820aee9b34cfebc841d756b12713517c9dafed7bee7b09c8e82c8f359e2e12b25da47c4e49e0aa4afc26193b774e0fa0dfd422c2aa09c3112b6d6e4b62b9a68
+Size (mysql-5.6.43.tar.gz) = 32200219 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
diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk
index 13421b54bea..e413a573023 100644
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2016/08/04 10:09:08 adam Exp $
+# $NetBSD: options.mk,v 1.13 2019/02/05 20:06:06 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
 
 # Enable OpenSSL support
 .if !empty(PKG_OPTIONS:Mssl)
-.	include "../../security/openssl/buildlink3.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CMAKE_ARGS+=		-DWITH_SSL=system
 .else
 CMAKE_ARGS+=		-DWITH_SSL=no
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 5ec091371ea..e975a7ddf48 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/11/22 11:53:33 adam Exp $
+# $NetBSD: Makefile,v 1.36 2019/02/05 20:06:06 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	MySQL 5, a free SQL database (server)
@@ -77,8 +77,8 @@ REPLACE_SH+=		mysql-test/t/long_tmpdir-master.sh
 REPLACE_SH+=		mysql-test/t/lowercase_mixed_tmpdir-master.sh
 REPLACE_SH+=		mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh
 
-CHECK_INTERPRETER_SKIP+=share/mysql/test/std_data/dtrace.d \
-			share/mysql/test/suite/opt_trace/validate_json.py
+CHECK_INTERPRETER_SKIP+=	share/mysql/test/std_data/dtrace.d
+CHECK_INTERPRETER_SKIP+=	share/mysql/test/suite/opt_trace/validate_json.py
 
 # Replace interpreter without pulling in Python dependecy
 # Update when PYTHON_VERSION_DEFAULT changes!
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index c71f9fcb5dd..01799adfb90 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2018/11/22 11:53:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2019/02/05 20:06:06 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -6609,6 +6609,7 @@ share/mysql/test/suite/rpl/r/rpl_read_only.result
 share/mysql/test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
 share/mysql/test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
 share/mysql/test/suite/rpl/r/rpl_relay_log_recovery_positions.result
+share/mysql/test/suite/rpl/r/rpl_relay_log_space_synchronization.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
 share/mysql/test/suite/rpl/r/rpl_relayrotate.result
@@ -7237,6 +7238,7 @@ share/mysql/test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
 share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
 share/mysql/test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
 share/mysql/test/suite/rpl/t/rpl_relay_log_recovery_positions.test
+share/mysql/test/suite/rpl/t/rpl_relay_log_space_synchronization.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_innodb.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_myisam.test
 share/mysql/test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -8048,6 +8050,7 @@ share/mysql/test/suite/sys_vars/r/myisam_stats_method_basic.result
 share/mysql/test/suite/sys_vars/r/myisam_stats_method_func.result
 share/mysql/test/suite/sys_vars/r/myisam_use_mmap_basic.result
 share/mysql/test/suite/sys_vars/r/named_pipe_basic.result
+share/mysql/test/suite/sys_vars/r/named_pipe_full_access_group_basic.result
 share/mysql/test/suite/sys_vars/r/net_buffer_length_basic.result
 share/mysql/test/suite/sys_vars/r/net_read_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/net_retry_count_basic_32.result
@@ -8670,6 +8673,7 @@ share/mysql/test/suite/sys_vars/t/myisam_stats_method_basic.test
 share/mysql/test/suite/sys_vars/t/myisam_stats_method_func.test
 share/mysql/test/suite/sys_vars/t/myisam_use_mmap_basic.test
 share/mysql/test/suite/sys_vars/t/named_pipe_basic.test
+share/mysql/test/suite/sys_vars/t/named_pipe_full_access_group_basic.test
 share/mysql/test/suite/sys_vars/t/net_buffer_length_basic.test
 share/mysql/test/suite/sys_vars/t/net_read_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/net_retry_count_basic_32.test