pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jul  7 20:18:20 UTC 2020

Modified Files:
        pkgsrc/databases/mysql56-client: Makefile.common distinfo
        pkgsrc/databases/mysql56-client/patches: patch-CMakeLists.txt
            patch-include_my__global.h
        pkgsrc/databases/mysql56-server: PLIST
Added Files:
        pkgsrc/databases/mysql56-client/patches:
            patch-storage_innobase_handler_i__s.cc
Removed Files:
        pkgsrc/databases/mysql56-client/patches:
            patch-client_completion_hash.cc patch-client_sql_string.h
            patch-cmake_build__configurations_mysql__release.cmake
            patch-sql_log_event.h patch-sql_sql_string.h
            patch-strings_decimal.c

Log Message:
mysql56: updated to 5.6.48

Changes in MySQL 5.6.48

Bugs Fixed

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.

The Event Scheduler had a memory leak.

Under certain circumstances, a memcached command could result in reading an uninitialized memory buffer, causing a failure.

CONCAT() and CONCAT_WS() could produce incorrect results in rare cases due to incorrect substring handling.

Scheduling of events could be disturbed by removing events.

Client programs could load authentication plugins from outside the plugin library.

A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.

In addition, attempting to insert a particular integer specified as a string caused a server exit when the string-to-integer conversion was not successful.

The client library could dereference a null pointer while fetching result set metadata from the server.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/databases/mysql56-client/Makefile.common
cvs rdiff -u -r1.55 -r1.56 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-client_completion_hash.cc \
    pkgsrc/databases/mysql56-client/patches/patch-client_sql_string.h \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_build__configurations_mysql__release.cmake
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-sql_log_event.h \
    pkgsrc/databases/mysql56-client/patches/patch-sql_sql_string.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_handler_i__s.cc
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-strings_decimal.c
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/mysql56-server/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql56-client/Makefile.common
diff -u pkgsrc/databases/mysql56-client/Makefile.common:1.56 pkgsrc/databases/mysql56-client/Makefile.common:1.57
--- pkgsrc/databases/mysql56-client/Makefile.common:1.56        Tue May 12 19:44:27 2020
+++ pkgsrc/databases/mysql56-client/Makefile.common     Tue Jul  7 20:18:20 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.56 2020/05/12 19:44:27 rillig Exp $
+# $NetBSD: Makefile.common,v 1.57 2020/07/07 20:18:20 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=      mysql-5.6.47
+DISTNAME=      mysql-5.6.48
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -42,50 +42,53 @@ MYSQL_EXTRA_CHARSET?=       all
 PKG_USERS_VARS+=       MYSQL_USER
 PKG_GROUPS_VARS+=      MYSQL_GROUP
 
-CONFIG_SHELL=          ${TOOLS_PATH.bash}
+CONFIG_SHELL=  ${TOOLS_PATH.bash}
 
-CFLAGS.IRIX+=          -DIRIX5 -DNEEDS_BSTRING_H
+CFLAGS.IRIX+=  -DIRIX5 -DNEEDS_BSTRING_H
 
-BUILD_DEFS+=           VARBASE
+BUILD_DEFS+=   VARBASE
 
 # paths
-CMAKE_ARGS+=           -DINSTALL_DOCDIR="share/doc/mysql"
-CMAKE_ARGS+=           -DINSTALL_DOCREADMEDIR="share/doc/mysql"
-CMAKE_ARGS+=           -DINSTALL_INCLUDEDIR="include/mysql"
-CMAKE_ARGS+=           -DINSTALL_INFODIR="info"
-CMAKE_ARGS+=           -DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+=           -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+=           -DINSTALL_MYSQLTESTDIR="share/mysql/test"
-CMAKE_ARGS+=           -DINSTALL_PLUGINDIR="lib/mysql/plugin"
-CMAKE_ARGS+=           -DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+=           -DINSTALL_SCRIPTDIR="bin"
-CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
-CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
-CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
-
-CMAKE_ARGS+=           -DWITH_ZLIB="system"
-CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MYSQL_CHARSET}
-CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MYSQL_COLLATION}
-CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
+CMAKE_ARGS+=   -DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_ARGS+=   -DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_ARGS+=   -DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_ARGS+=   -DINSTALL_INFODIR="info"
+CMAKE_ARGS+=   -DINSTALL_MANDIR="${PKGMANDIR}"
+CMAKE_ARGS+=   -DINSTALL_MYSQLSHAREDIR="share/mysql"
+CMAKE_ARGS+=   -DINSTALL_MYSQLTESTDIR="share/mysql/test"
+CMAKE_ARGS+=   -DINSTALL_PLUGINDIR="lib/mysql/plugin"
+CMAKE_ARGS+=   -DINSTALL_SBINDIR="sbin"
+CMAKE_ARGS+=   -DINSTALL_SCRIPTDIR="bin"
+CMAKE_ARGS+=   -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
+CMAKE_ARGS+=   -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_ARGS+=   -DMYSQL_DATADIR=${MYSQL_DATADIR}
+
+CMAKE_ARGS+=   -DWITH_ZLIB="system"
+CMAKE_ARGS+=   -DDEFAULT_CHARSET=${MYSQL_CHARSET}
+CMAKE_ARGS+=   -DDEFAULT_COLLATION=${MYSQL_COLLATION}
+CMAKE_ARGS+=   -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q}
+# Avoid disclosure of files from a client to a malicious server, described here:
+# https://gwillem.gitlab.io/2019/01/17/adminer-4.6.2-file-disclosure-vulnerability/
+CMAKE_ARGS+=   -DENABLED_LOCAL_INFILE=OFF
 
 # MySQL 5 depends on builtin functions enabled with i486 and later with GCC.
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-GNU_ARCH.i386=         i486
-CFLAGS+=               -march=i486
+GNU_ARCH.i386= i486
+CFLAGS+=       -march=i486
 .endif
 
 # Ensure the correct DTrace ABI is used.
 .if !empty(ABI)
-CMAKE_ARGS+=           -DDTRACE_FLAGS="-${ABI}"
+CMAKE_ARGS+=   -DDTRACE_FLAGS="-${ABI}"
 .endif
 
-CPPFLAGS+=             -Dunix
-CFLAGS+=               -DUSE_OLD_FUNCTIONS # 3.23.x compat
-CFLAGS+=               -D__STDC_FORMAT_MACROS=1 # always defined too late
+CPPFLAGS+=     -Dunix
+CFLAGS+=       -DUSE_OLD_FUNCTIONS # 3.23.x compat
+CFLAGS+=       -D__STDC_FORMAT_MACROS=1 # always defined too late
 
 .if ${OPSYS} != "Interix"
-CFLAGS+=               -fPIC -DPIC
-CXXFLAGS+=             -fPIC -DPIC
+CFLAGS+=       -fPIC -DPIC
+CXXFLAGS+=     -fPIC -DPIC
 .endif
 
 CMAKE_ARGS.SunOS+=     -DFORCE_UNSUPPORTED_COMPILER=YES

Index: pkgsrc/databases/mysql56-client/distinfo
diff -u pkgsrc/databases/mysql56-client/distinfo:1.55 pkgsrc/databases/mysql56-client/distinfo:1.56
--- pkgsrc/databases/mysql56-client/distinfo:1.55       Tue Mar 17 18:59:16 2020
+++ pkgsrc/databases/mysql56-client/distinfo    Tue Jul  7 20:18:20 2020
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.55 2020/03/17 18:59:16 adam Exp $
+$NetBSD: distinfo,v 1.56 2020/07/07 20:18:20 adam Exp $
 
-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 (mysql-5.6.48.tar.gz) = 419977992ac9979ee2a45c7b7ae2b781633c2a95
+RMD160 (mysql-5.6.48.tar.gz) = 3bc7d47d78b61f5262ce632d81d15c280db671ab
+SHA512 (mysql-5.6.48.tar.gz) = 4a34ad9e2b67137027c0bcdc8716d6e5a52bd2faec68482bd37b12138010a399945a0c3dfbb3ae41fe3f71d1c2dd8a4f2ca5e0dc0a780345a687b819ae847714
+Size (mysql-5.6.48.tar.gz) = 32401200 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
 Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
-SHA1 (patch-CMakeLists.txt) = f3dc26d34730533c26f4496311767d774a72c5c4
-SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
+SHA1 (patch-CMakeLists.txt) = 5c947612d9bbe7599049b761c75840168c1d36e0
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
-SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = f6ddee05e028df9d4fdb4228a7e687b825fea1b3
 SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91
@@ -23,7 +20,7 @@ SHA1 (patch-cmd-line-utils_libedit_chart
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
 SHA1 (patch-include_m__string.h) = 1622466a65c61a4ab0838bd80f6c24c061407eaf
-SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
+SHA1 (patch-include_my__global.h) = 072d5ebee3f432be46c58506effb79e4c45b5115
 SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my_net.h) = 8d97e4396fd1df095798fca79cc07daffff449d3
 SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca
@@ -35,8 +32,6 @@ SHA1 (patch-scripts_CMakeLists.txt) = 5b
 SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5
-SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e
-SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf
 SHA1 (patch-sql_sys__vars.cc) = 355b17dac8da6f94c9996ae406df304113a1f8f5
 SHA1 (patch-storage_archive_CMakeLists.txt) = e739ef4884a154d7e33e8aae24234fd6855119b7
 SHA1 (patch-storage_blackhole_CMakeLists.txt) = b9c526783cabd04ea7859d62cb1930ff35f905f8
@@ -44,8 +39,8 @@ SHA1 (patch-storage_csv_CMakeLists.txt) 
 SHA1 (patch-storage_example_CMakeLists.txt) = c48c46b8130f00fcb5098e6b2280bff8f16b5559
 SHA1 (patch-storage_federated_CMakeLists.txt) = f809504bad63129a06ce455b49ee40cca940891e
 SHA1 (patch-storage_heap_CMakeLists.txt) = 0a1a5a7b5e83f14cec43bfa4782dd4bb7b629347
+SHA1 (patch-storage_innobase_handler_i__s.cc) = 745eeb6a663b78040cbb64cf9667f0447f7a1b73
 SHA1 (patch-storage_innobase_include_univ.i) = eb305029b8529cab88c80d75821fc9940e0f6b0b
 SHA1 (patch-storage_myisam_CMakeLists.txt) = 55897ae78208f78a396776d1082cb5f98631fff8
 SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324af9855a4e
 SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a71c14952c3a
-SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903

Index: pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt:1.6 pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt:1.6    Sun Jan 20 18:04:49 2019
+++ pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt        Tue Jul  7 20:18:20 2020
@@ -1,12 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2019/01/20 18:04:49 maya Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2020/07/07 20:18:20 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
 
-Backport of https://github.com/mysql/mysql-server/commit/98ed3d8bc8ad724686d26c7bf98dced3bd1777be
-Avoid disclosure of files from a client to a malicious server, described here:
-https://gwillem.gitlab.io/2019/01/17/adminer-4.6.2-file-disclosure-vulnerability/
-
 --- CMakeLists.txt.orig        2016-07-11 09:19:51.000000000 +0000
 +++ CMakeLists.txt
 @@ -202,6 +202,7 @@ IF(DISABLE_SHARED)
@@ -17,15 +13,6 @@ https://gwillem.gitlab.io/2019/01/17/adm
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
-@@ -345,7 +346,7 @@ IF(REPRODUCIBLE_BUILD)
- ENDIF()
- 
- OPTION(ENABLED_LOCAL_INFILE
-- "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
-+"If we should should enable LOAD DATA LOCAL by default" OFF)
- MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
- 
- OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF)
 @@ -495,7 +496,6 @@ ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)

Index: pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h
diff -u pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h:1.2 pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h:1.3
--- pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h:1.2      Tue Dec  3 20:02:42 2013
+++ pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h  Tue Jul  7 20:18:20 2020
@@ -1,8 +1,21 @@
-$NetBSD: patch-include_my__global.h,v 1.2 2013/12/03 20:02:42 adam Exp $
+$NetBSD: patch-include_my__global.h,v 1.3 2020/07/07 20:18:20 adam Exp $
 
---- include/my_global.h.orig   2013-04-28 14:06:29.000000000 +0000
+Portability: include <bstring.h> if exists.
+
+--- include/my_global.h.orig   2020-03-09 10:37:59.000000000 +0000
 +++ include/my_global.h
-@@ -1119,7 +1119,8 @@ typedef char             my_bool; /* Small bool */
+@@ -130,6 +130,10 @@
+ #include <io.h>       /* access(), chmod() */
+ #include <process.h>  /* getpid() */
+ 
++#ifdef NEEDS_BSTRING_H
++#include <bstring.h> /* defines bzero() */
++#endif
++
+ #define sleep(a) Sleep((a)*1000)
+ 
+ /* Define missing access() modes. */
+@@ -1118,7 +1122,8 @@ typedef char             my_bool; /* Small bool */
  
  /* Provide __func__ macro definition for platforms that miss it. */
  #if __STDC_VERSION__ < 199901L

Index: pkgsrc/databases/mysql56-server/PLIST
diff -u pkgsrc/databases/mysql56-server/PLIST:1.36 pkgsrc/databases/mysql56-server/PLIST:1.37
--- pkgsrc/databases/mysql56-server/PLIST:1.36  Tue Mar 17 18:59:16 2020
+++ pkgsrc/databases/mysql56-server/PLIST       Tue Jul  7 20:18:20 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2020/03/17 18:59:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2020/07/07 20:18:20 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -3547,6 +3547,7 @@ share/mysql/test/suite/innodb/r/flush-ha
 share/mysql/test/suite/innodb/r/foreign_key.result
 share/mysql/test/suite/innodb/r/ibuf_not_empty.result
 share/mysql/test/suite/innodb/r/import.result
+share/mysql/test/suite/innodb/r/import_tablespace_schema_missmatch.result
 share/mysql/test/suite/innodb/r/import_update_stats.result
 share/mysql/test/suite/innodb/r/index_length.result
 share/mysql/test/suite/innodb/r/index_tree_operation.result
@@ -3721,6 +3722,7 @@ share/mysql/test/suite/innodb/r/innodb_s
 share/mysql/test/suite/innodb/r/innodb_stats_sample_pages.result
 share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
 share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
+share/mysql/test/suite/innodb/r/innodb_sys_var_valgrind.result
 share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
 share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
@@ -3757,6 +3759,7 @@ share/mysql/test/suite/innodb/t/foreign_
 share/mysql/test/suite/innodb/t/ibuf_not_empty-master.opt
 share/mysql/test/suite/innodb/t/ibuf_not_empty.test
 share/mysql/test/suite/innodb/t/import.test
+share/mysql/test/suite/innodb/t/import_tablespace_schema_missmatch.test
 share/mysql/test/suite/innodb/t/import_update_stats.test
 share/mysql/test/suite/innodb/t/index_length.test
 share/mysql/test/suite/innodb/t/index_tree_operation.test
@@ -3967,6 +3970,7 @@ share/mysql/test/suite/innodb/t/innodb_s
 share/mysql/test/suite/innodb/t/innodb_stats_sample_pages.test
 share/mysql/test/suite/innodb/t/innodb_stats_table_flag_auto_recalc.test
 share/mysql/test/suite/innodb/t/innodb_stats_table_flag_sample_pages.test
+share/mysql/test/suite/innodb/t/innodb_sys_var_valgrind.test
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback-master.opt
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
@@ -6667,6 +6671,7 @@ share/mysql/test/suite/rpl/r/rpl_row_has
 share/mysql/test/suite/rpl/r/rpl_row_hash_scan_sanity.result
 share/mysql/test/suite/rpl/r/rpl_row_idempotency.result
 share/mysql/test/suite/rpl/r/rpl_row_ignorable_event.result
+share/mysql/test/suite/rpl/r/rpl_row_image_check_for_insert_select.result
 share/mysql/test/suite/rpl/r/rpl_row_img_blobs.result
 share/mysql/test/suite/rpl/r/rpl_row_img_eng_full.result
 share/mysql/test/suite/rpl/r/rpl_row_img_eng_min.result
@@ -7322,6 +7327,7 @@ share/mysql/test/suite/rpl/t/rpl_row_ide
 share/mysql/test/suite/rpl/t/rpl_row_ignorable_event-master.opt
 share/mysql/test/suite/rpl/t/rpl_row_ignorable_event-slave.opt
 share/mysql/test/suite/rpl/t/rpl_row_ignorable_event.test
+share/mysql/test/suite/rpl/t/rpl_row_image_check_for_insert_select.test
 share/mysql/test/suite/rpl/t/rpl_row_img.cnf
 share/mysql/test/suite/rpl/t/rpl_row_img_blobs.cnf
 share/mysql/test/suite/rpl/t/rpl_row_img_blobs.test

Added files:

Index: pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_handler_i__s.cc
diff -u /dev/null pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_handler_i__s.cc:1.1
--- /dev/null   Tue Jul  7 20:18:20 2020
+++ pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_handler_i__s.cc      Tue Jul  7 20:18:20 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-storage_innobase_handler_i__s.cc,v 1.1 2020/07/07 20:18:20 adam Exp $
+
+Add missing include.
+
+--- storage/innobase/handler/i_s.cc.orig       2020-07-07 19:03:24.000000000 +0000
++++ storage/innobase/handler/i_s.cc
+@@ -31,6 +31,7 @@ InnoDB INFORMATION SCHEMA tables interfa
+ Created July 18, 2007 Vasil Dimov
+ *******************************************************/
+ 
++#include <string>
+ #include <mysqld_error.h>
+ #include <sql_acl.h>
+ 



Home | Main Index | Thread Index | Old Index