mysql55: updated to 5.5.62

Changes in MySQL 5.5.62

Functionality Added or Changed

* Previously, file I/O performed in the I/O cache in the mysys library was not instrumented, affecting in particular file I/O statistics reported by the Performance Schema about the binary log index file. Now, this I/O is instrumented and Performance Schema statistics are accurate. Thanks to Yura Sorokin for the contribution.

* The zlib library version bundled with MySQL was raised from version 1.2.3 to version 1.2.11. MySQL implements compression with the help of the zlib library.

* The zlib compressBound() function in zlib 1.2.11 returns a slightly higher estimate of the buffer size required to compress a given length of bytes than it did in zlib version 1.2.3. The compressBound() function is called by InnoDB functions that determine the maximum row size permitted when creating compressed InnoDB tables or inserting rows into compressed InnoDB tables. As a result, CREATE TABLE ... ROW_FORMAT=COMPRESSED or INSERT operations with row sizes very close to the maximum row size that were successful in earlier releases could now fail.

Bugs Fixed

* MySQL Server and test RPM packages were missing perl-Data-Dumper as a dependency.

* For the mysql client, the -b short option was associated with two long options, --no-beep and --binary-as-hex. The -b option now is associated only with --no-beep.

* During server startup/shutdown, PID files could be mishandled.

* For MEMORY tables, memory overflow errors could occur.

* When converting from a BLOB (or TEXT) type to a smaller BLOB (or TEXT) type, no warning or error was reported informing about the truncation or data loss. Now an appropriate error is issued in strict SQL mode and a warning in nonstrict SQL mode.

* ALTER TABLE ... REORGANIZE PARTITION ... could result in incorrect behavior if any partition other than the last was missing the VALUES LESS THAN part of the syntax.

6 files changed, 10 insertions, 32 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 1a3dc867745..b56f26033a9 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2018/08/22 09:43:12 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/11/22 11:27:11 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/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index be15036b441..81727cfa815 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.63 2018/01/16 16:23:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2018/11/22 11:27:11 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.59
+DISTNAME=	mysql-5.5.62
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/PLIST b/databases/mysql55-client/PLIST
index b1c3a4c858e..8a9357a77ff 100644
--- a/databases/mysql55-client/PLIST
+++ b/databases/mysql55-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/09/16 07:13:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/11/22 11:27:11 adam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_client_test
@@ -95,11 +95,8 @@ man/man1/myisam_ftdump.1
 man/man1/myisamchk.1
 man/man1/myisamlog.1
 man/man1/myisampack.1
-man/man1/mysql-stress-test.pl.1
-man/man1/mysql-test-run.pl.1
 man/man1/mysql.1
 man/man1/mysql.server.1
-man/man1/mysql_client_test.1
 man/man1/mysql_client_test_embedded.1
 man/man1/mysql_config.1
 man/man1/mysql_convert_table_format.1
@@ -127,7 +124,6 @@ man/man1/mysqlimport.1
 man/man1/mysqlman.1
 man/man1/mysqlshow.1
 man/man1/mysqlslap.1
-man/man1/mysqltest.1
 man/man1/mysqltest_embedded.1
 man/man1/perror.1
 man/man1/replace.1
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 9bfb7d30d82..fb2ca8f0259 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.61 2018/01/16 16:23:20 adam Exp $
+$NetBSD: distinfo,v 1.62 2018/11/22 11:27:11 adam Exp $
 
-SHA1 (mysql-5.5.59.tar.gz) = 97a8bd08a0ba0ba8c44f0d81eac70131990819a2
-RMD160 (mysql-5.5.59.tar.gz) = 40c585476491a954d2ea1523a1db2425aebbc406
-SHA512 (mysql-5.5.59.tar.gz) = 18abca4a607d7f7ad90e9adb989c665302ee85e264f298fdc3591c4d9cd85a2486f1b402aea1ac3672506d1433eb1f3a246da5e4abd04dc41344ed9fed5ef0ae
-Size (mysql-5.5.59.tar.gz) = 21050313 bytes
+SHA1 (mysql-5.5.62.tar.gz) = b3df3c8c50b8655878cfbc288537f44715f6b060
+RMD160 (mysql-5.5.62.tar.gz) = 4b6fdfc37dc87fdabb2b944b695d5b9e687e22f2
+SHA512 (mysql-5.5.62.tar.gz) = 1080a3989c20bbbfe98739f99dacd183f2087ceee5147845852144240386808568af4c908ecdbccdcb6114000ab760ed7257492834d50018eff9520260fd91ce
+Size (mysql-5.5.62.tar.gz) = 21111902 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
@@ -11,7 +11,6 @@ Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
-SHA1 (patch-client_mysql.cc) = 69e40248d654e385abee9272df093afc525971bc
 SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2
 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
 SHA1 (patch-client_mysqlshow.c) = a12b06241eee91d1ec11e3b7e4f3125aa6c79905
diff --git a/databases/mysql55-client/patches/patch-client_mysql.cc b/databases/mysql55-client/patches/patch-client_mysql.cc
deleted file mode 100644
index 3d239844a1e..00000000000
--- a/databases/mysql55-client/patches/patch-client_mysql.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-client_mysql.cc,v 1.2 2017/06/19 12:07:50 jperkin Exp $
-
-Compilation warning fix from upstream.
-
---- client/mysql.cc.orig	2017-04-27 07:12:30.000000000 +0000
-+++ client/mysql.cc
-@@ -2666,7 +2666,7 @@ You can turn off this feature to get a q
-         mysql_free_result(fields);
-         break;
-       }
--      field_names[i][num_fields*2]= '\0';
-+      field_names[i][num_fields*2]= NULL;
-       j=0;
-       while ((sql_field=mysql_fetch_field(fields)))
-       {
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 31d0c0e9f9c..264a4b00c83 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2018/08/22 09:43:12 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/11/22 11:27:11 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*