5 files changed, 18 insertions, 12 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index f15da2c15c9..d8115109739 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2020/01/18 21:48:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2020/03/17 18:59:16 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 aca6c6c7a60..61313ab53e2 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.53 2019/10/14 19:44:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.54 2020/03/17 18:59:16 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=	mysql-5.6.46
+DISTNAME=	mysql-5.6.47
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -19,6 +19,8 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash gmake perl:run
 USE_GCC_RUNTIME=	yes
 
+CHECK_PORTABILITY_SKIP+=	packaging/deb-in/mysql-packagesource-server.config.in
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "options.mk"
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 0ba21222b79..286b6f0735a 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2019/10/14 19:44:46 adam Exp $
+$NetBSD: distinfo,v 1.55 2020/03/17 18:59:16 adam Exp $
 
-SHA1 (mysql-5.6.46.tar.gz) = dd735b6efa8f5be61ba65b58755188f38986151c
-RMD160 (mysql-5.6.46.tar.gz) = c0486a82fc070cffb7b56609c630dfec369e0240
-SHA512 (mysql-5.6.46.tar.gz) = 5a1ef9085b1461adb6eec7e9c80d347736ddbe2cd5087b5aebcac54094af8ce3bc5dc99499dd517a469e0bc4a40df8325e4306da5a05388950f4fd6652f6b5b9
-Size (mysql-5.6.46.tar.gz) = 32395002 bytes
+SHA1 (mysql-5.6.47.tar.gz) = 9a01ef6bf2a85ec819c6ececad7c2b733375aff3
+RMD160 (mysql-5.6.47.tar.gz) = c580c4bab8c81db0bc9eac19223fb2b260e35f55
+SHA512 (mysql-5.6.47.tar.gz) = ad5df97135a30f1ff1790ae03f7ad449deb5f5a8d15aa17d6365c49beefd250164a21175b6e82fc64c2a8576d62e8a3b3efc678ef981cd9638f8964897de1a8b
+Size (mysql-5.6.47.tar.gz) = 32388152 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-server/Makefile b/databases/mysql56-server/Makefile
index 3d7c6d404c4..8b74e73523f 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2020/01/18 21:48:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2020/03/17 18:59:16 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 b8af57e16f2..bddeec23521 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2019/10/14 19:44:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.36 2020/03/17 18:59:16 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -418,6 +418,7 @@ share/mysql/test/include/diff_servers.inc
 share/mysql/test/include/diff_tables.inc
 share/mysql/test/include/end_include_file.inc
 share/mysql/test/include/endspace.inc
+share/mysql/test/include/escape_sql.inc
 share/mysql/test/include/eval.inc
 share/mysql/test/include/execute_with_statistics.inc
 share/mysql/test/include/expect_qep.inc
@@ -1204,6 +1205,7 @@ share/mysql/test/r/innodb_pk_extension_off.result
 share/mysql/test/r/innodb_pk_extension_on.result
 share/mysql/test/r/innodb_recovery_with_upper_case_names.result
 share/mysql/test/r/insert.result
+share/mysql/test/r/insert_debug.result
 share/mysql/test/r/insert_notembedded.result
 share/mysql/test/r/insert_select.result
 share/mysql/test/r/insert_update.result
@@ -6466,6 +6468,7 @@ share/mysql/test/suite/rpl/r/rpl_grant_plugin.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result
 share/mysql/test/suite/rpl/r/rpl_gtid_binlog_errors.result
+share/mysql/test/suite/rpl/r/rpl_gtid_deleted_binlog_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_drop_table.result
@@ -6997,6 +7000,7 @@ share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock.test
 share/mysql/test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test
 share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_binlog_errors.test
+share/mysql/test/suite/rpl/t/rpl_gtid_deleted_binlog_fail_to_connect.test
 share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test
@@ -9312,6 +9316,8 @@ share/mysql/test/t/innodb_pk_extension_on.test
 share/mysql/test/t/innodb_recovery_with_upper_case_names-master.opt
 share/mysql/test/t/innodb_recovery_with_upper_case_names.test
 share/mysql/test/t/insert.test
+share/mysql/test/t/insert_debug-master.opt
+share/mysql/test/t/insert_debug.test
 share/mysql/test/t/insert_notembedded.test
 share/mysql/test/t/insert_select.test
 share/mysql/test/t/insert_update.test