mysql57: updated to 5.7.36

Changes in MySQL 5.7.36

Security Notes

Bugs Fixed

Security Notes

The linked OpenSSL library for MySQL Server has been updated to version 1.1.1l. Issues fixed in the new OpenSSL version are described at https://www.openssl.org/news/cl111.txt and and http://www.openssl.org/news/vulnerabilities.html.

Bugs Fixed

Incompatible Change: For all SELECT statements on a view, the query digest was based on the view definition. As a result, different queries had the same digest and aggregated together in the Performance Schema table events_statements_summary_by_digest, so statistics in that table were not usable for distinguishing distinct SELECT statements.

The query digest for each SELECT statement on a view now is based on the SELECT, not the view definition. This enables distinguishing distinct SELECT statements in the events_statements_summary_by_digest table. However, tools that use query digests may need some adjustment to account for this change. For example, MySQL Enterprise Firewall and query rewrite plugins rely on query digests and existing rules for them that are associated with views may need to be updated.

InnoDB: With undo log truncation enabled (innodb_undo_log_truncate=ON), it was possible for a deadlock and eventual failure to occur when an undo log truncate operation was initiated after a version upgrade from MySQL 5.6 to MySQL 5.7.34 or earlier. A patch introduced in MySQL 5.7.35

[Note] InnoDB: Found duplicate reference rseg: 33 space: 1 page: 3
[Note] InnoDB: Reset pre-5.7.2 rseg: 1 after duplicate is found.
If pre-5.7.2 rollback segment slots have no undo data to purge, a message similar to the following is emitted:

[Note] InnoDB: Successfully reset 32 pre-5.7.2 rseg slots.
If undo data is found in pre-5.7.2 rollback segment slots, a message similar to the following is emitted recommending a slow shutdown and restart:

[Note] InnoDB: pre-5.7.2 rseg: 2 holds data to be purged.
History length: 1. Recommend slow shutdown with innodb_fast_shutdown=0 and restart

InnoDB: Truncation of an undo tablespace during use by an active transaction raised an assertion failure. The transaction was prematurely marked as complete, permitting the truncation operation.

InnoDB: Deleting or updating a row from a parent table initiated a cascading SET NULL operation on the child table that set a virtual column value to NULL. The virtual column value should have been derived from the base column value.

Thanks to Yin Peng at Tencent for the contribution.

InnoDB: The InnoDB recovery process did not recognize that page compression had been applied to data that was being recovered, causing the tablespace data file to increase in size during the redo log apply phase, which could lead to a recovery failure for systems approaching a disk-full state.

Replication: The error messages issued by MySQL Replication when GTIDs required for auto-positioning have been purged could be incorrectly assigned or scrambled in some situations.

Replication: The contents of the gtid_executed and gtid_purged GTID sets were not persisted after restoring a dump taken using mysqldump. The dump file sequence has now been changed so that the mysql schema (which contains the mysql.gtid_executed table) is not dropped after the gtid_purged GTID set is written. A new option --skip-mysql-schema is added for mysqldump which lets you choose not to drop the mysql schema at all.

JSON: Conversion of JSON values to text caused linear growth of the destination string, resulting in an unnecessarily high number of reallocations. Now this process uses exponential growth instead, to reduce the number of allocations required.

This fix originally appeared in MySQL 8.0 and was backported to MySQL 5.7 by Annirudh Prasad, whom we thank for the contribution.

Concurrent insert operations on multiple tables with full-text indexes caused a large number of full-text index synchronization requests, resulting in an out of memory condition.

When a query uses a temporary table for aggregation, the group by item is used as a unique constraint on the temporary table: If the item value is already present, the row is updated; otherwise, a new row is inserted into the temporary table. If the item has a result field or reference item, it it evaluated twice, once to check whether the result exists in the temporary table and, if not, again while constructing the row to be inserted. When the group by item was nondeterministic, the result value used to check for existence differed from that with which an insert was attempted, causing the insert to be rejected if the value already existed in the table.

We fix this by using the hash of any nondeterministic items as the unique constraint, so that the hash is evaluated once only.

Quote handling was improved for the SHOW GRANTS statement.

6 files changed, 18 insertions, 13 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 34e0788580e..3bc9179824a 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2021/09/29 19:00:27 adam Exp $
+# $NetBSD: Makefile,v 1.40 2021/10/19 18:57:37 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/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index e9878159eae..fec702f2561 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.35 2021/07/25 20:29:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2021/10/19 18:57:37 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.35
+DISTNAME=	mysql-5.7.36
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index cfe07a53908..c023478768b 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2021/07/25 20:29:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/10/19 18:57:37 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.22
+lib/libmysqlclient.so.20.3.23
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index b3cd40a160a..b5ef0e476cc 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2021/10/07 13:35:15 nia Exp $
+$NetBSD: distinfo,v 1.45 2021/10/19 18:57:37 adam Exp $
 
-RMD160 (mysql-5.7.35.tar.gz) = 3193e5c3d9ec916229d0050acf37af2a4d4c8d5e
-SHA512 (mysql-5.7.35.tar.gz) = ec22599b67d5826fcc04c146f06fdd18080003a95b366bef133af0ea772b0b0fc2f613f17699cd3c8d461acb71b7e94af856a4574e644ec25b70db29abac509d
-Size (mysql-5.7.35.tar.gz) = 56228901 bytes
+RMD160 (mysql-5.7.36.tar.gz) = 64d1d42376f49b4b3e7df5c0b310b53a89bddbc7
+SHA512 (mysql-5.7.36.tar.gz) = 34badfff21c774a5a05cca5b505725eda440ad3d7aca4de593ec58c13a552fe4c5465e1f17b0493a21971321185ffcfa031267df13188e33503f003bfa8a14b6
+Size (mysql-5.7.36.tar.gz) = 56238341 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index b362161e8a5..1f0f4216233 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2021/09/29 19:00:27 adam Exp $
+# $NetBSD: Makefile,v 1.41 2021/10/19 18:57:37 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/mysql57-server/PLIST b/databases/mysql57-server/PLIST
index 33d27ed7b04..87e32213e7f 100644
--- a/databases/mysql57-server/PLIST
+++ b/databases/mysql57-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2021/07/25 20:29:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/10/19 18:57:37 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -1602,6 +1602,7 @@ share/mysql/test/r/mysqldump-no-binlog.result
 share/mysql/test/r/mysqldump.result
 share/mysql/test/r/mysqldump_bug29998457.result
 share/mysql/test/r/mysqldump_bugs.result
+share/mysql/test/r/mysqldump_gtid_state.result
 share/mysql/test/r/mysqldump_restore.result
 share/mysql/test/r/mysqldumpslow.result
 share/mysql/test/r/mysqlimport.result
@@ -5956,6 +5957,7 @@ share/mysql/test/suite/innodb_fts/include/tablespace_location.inc
 share/mysql/test/suite/innodb_fts/include/tablespace_location_alter.inc
 share/mysql/test/suite/innodb_fts/include/tablespace_location_error.inc
 share/mysql/test/suite/innodb_fts/r/basic.result
+share/mysql/test/suite/innodb_fts/r/bug_32831765.result
 share/mysql/test/suite/innodb_fts/r/compatibility.result
 share/mysql/test/suite/innodb_fts/r/compatibility_win.result
 share/mysql/test/suite/innodb_fts/r/ddl.result
@@ -6009,6 +6011,7 @@ share/mysql/test/suite/innodb_fts/r/tablespace_location_error.result
 share/mysql/test/suite/innodb_fts/r/transaction.result
 share/mysql/test/suite/innodb_fts/r/truncate.result
 share/mysql/test/suite/innodb_fts/t/basic.test
+share/mysql/test/suite/innodb_fts/t/bug_32831765.test
 share/mysql/test/suite/innodb_fts/t/compatibility.test
 share/mysql/test/suite/innodb_fts/t/compatibility_win.test
 share/mysql/test/suite/innodb_fts/t/ddl.test
@@ -8591,6 +8594,7 @@ share/mysql/test/suite/perfschema/r/ddl_uvar_by_thread.result
 share/mysql/test/suite/perfschema/r/ddl_variables_by_thread.result
 share/mysql/test/suite/perfschema/r/digest_null_literal.result
 share/mysql/test/suite/perfschema/r/digest_table_full.result
+share/mysql/test/suite/perfschema/r/digest_view.result
 share/mysql/test/suite/perfschema/r/dml_accounts.result
 share/mysql/test/suite/perfschema/r/dml_cond_instances.result
 share/mysql/test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
@@ -9039,6 +9043,7 @@ share/mysql/test/suite/perfschema/t/ddl_variables_by_thread.test
 share/mysql/test/suite/perfschema/t/digest_null_literal.test
 share/mysql/test/suite/perfschema/t/digest_table_full-master.opt
 share/mysql/test/suite/perfschema/t/digest_table_full.test
+share/mysql/test/suite/perfschema/t/digest_view.test
 share/mysql/test/suite/perfschema/t/disabled.def
 share/mysql/test/suite/perfschema/t/dml_accounts.test
 share/mysql/test/suite/perfschema/t/dml_cond_instances.test
@@ -14191,6 +14196,8 @@ share/mysql/test/t/mysqldump-no-binlog.test
 share/mysql/test/t/mysqldump.test
 share/mysql/test/t/mysqldump_bug29998457.test
 share/mysql/test/t/mysqldump_bugs.test
+share/mysql/test/t/mysqldump_gtid_state-master.opt
+share/mysql/test/t/mysqldump_gtid_state.test
 share/mysql/test/t/mysqldump_restore.test
 share/mysql/test/t/mysqldumpslow.test
 share/mysql/test/t/mysqlimport.test