svn commit: r533271 - in branches/2020Q2/databases: mysql56-client mysql56-server mysql56-server/files

[Jochen Neumeister]

Author: joneum
Date: Tue Apr 28 21:11:55 2020
New Revision: 533271
URL: https://svnweb.freebsd.org/changeset/ports/533271

Log:
  MFH: r533270
  
  databases/mysql56-{client, server}: Update to latest release 5.6.48
  
  Bugfix:
  - InnoDB: A tablespace import operation that failed due to the source and destination tables being defined with different DATA DIRECTORY clauses reported an insufficiently descriptive schema mismatch error. Moreover, if a .cfg file was not present, the same operation would raise an assertion failure. A more informative error message is now reported in both cases before the import operation is terminated due to the data directory mismatch.
  
  - InnoDB: Updating certain InnoDB system variables that take string values raised invalid read errors during Valgrind testing.
  
  - Replication: In the event of an unplanned disconnection of a replication slave from the master, the reference to the master's dump thread might not be removed from the list of registered slaves, in which case statements that accessed the list of slaves would fail. The issue has now been fixed
  
  - Replication: With the settings binlog_format=MIXED, tx_isolation=READ-COMMITTED, and binlog_row_image=FULL, an INSERT ... SELECT query involving a transactional storage engine omitted any columns with a null value from the row image written to the binary log. This happened because when processing INSERT ... SELECT statements, the columns were marked for inserts before the binary logging format was selected. The issue has now been fixed.
  
  More Infos: https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-48.html
  
  Security:	21d59ea3-8559-11ea-a5e2-d4c9ef517024 (MySQL - Server)
  Security:	622b5c47-855b-11ea-a5e2-d4c9ef517024 (MySQL - Client)
  Sponsored by:	Netzkommune GmbH
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2020Q2/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
     - copied unchanged from r533270, head/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
Modified:
  branches/2020Q2/databases/mysql56-client/Makefile
  branches/2020Q2/databases/mysql56-server/Makefile
  branches/2020Q2/databases/mysql56-server/distinfo
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/databases/mysql56-client/Makefile
==============================================================================
--- branches/2020Q2/databases/mysql56-client/Makefile	Tue Apr 28 21:08:35 2020	(r533270)
+++ branches/2020Q2/databases/mysql56-client/Makefile	Tue Apr 28 21:11:55 2020	(r533271)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)

Modified: branches/2020Q2/databases/mysql56-server/Makefile
==============================================================================
--- branches/2020Q2/databases/mysql56-server/Makefile	Tue Apr 28 21:08:35 2020	(r533270)
+++ branches/2020Q2/databases/mysql56-server/Makefile	Tue Apr 28 21:11:55 2020	(r533271)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.6.47
-PORTREVISION?=	1
+PORTVERSION=	5.6.48
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
@@ -139,8 +139,8 @@ FEDERATED_SUB_LIST_OFF+=	FEDER=""
 USES+=		compiler:gcc-c++11-lib
 USE_CXXSTD=	gnu++11
 .else
-USES+=		compiler:c++11-lang
-USE_CXXSTD=	gnu++98
+USES+=		compiler:c++11-lib
+USE_CXXSTD=	c++11
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057

Modified: branches/2020Q2/databases/mysql56-server/distinfo
==============================================================================
--- branches/2020Q2/databases/mysql56-server/distinfo	Tue Apr 28 21:08:35 2020	(r533270)
+++ branches/2020Q2/databases/mysql56-server/distinfo	Tue Apr 28 21:11:55 2020	(r533271)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579257087
-SHA256 (mysql-5.6.47.tar.gz) = 0919096705784c62af831bb607e99345083edd76967c8c65966728742a9127fe
-SIZE (mysql-5.6.47.tar.gz) = 32388152
+TIMESTAMP = 1588086392
+SHA256 (mysql-5.6.48.tar.gz) = 82a423acd1f74c1ff5787c38a8b6dc00d36b55662ad50c73bb2261bbc95035c2
+SIZE (mysql-5.6.48.tar.gz) = 32401200

Copied: branches/2020Q2/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc (from r533270, head/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc	Tue Apr 28 21:11:55 2020	(r533271, copy of r533270, head/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc)
@@ -0,0 +1,13 @@
+--- storage/innobase/handler/i_s.cc.orig	2020-03-09 10:37:59 UTC
++++ storage/innobase/handler/i_s.cc
+@@ -43,6 +43,10 @@ Created July 18, 2007 Vasil Dimov
+ #include <sql_plugin.h>
+ #include <mysql/innodb_priv.h>
+ 
++#include <string>
++#include <sstream>
++#include <iostream>
++
+ #include "btr0pcur.h"
+ #include "btr0types.h"
+ #include "dict0dict.h"