git: 68b6a7c4553e - main - databases/mysqlwsrep56-server: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Jun 2023 01:44:25 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=68b6a7c4553e64d9e600752a4022eb6837b84958
commit 68b6a7c4553e64d9e600752a4022eb6837b84958
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-30 01:26:54 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-30 01:31:24 +0000
databases/mysqlwsrep56-server: Remove expired port
2023-06-30 databases/mysqlwsrep56-server: Requires upstream EOL MySQL 5.6
Approved by: portmgr (blanket)
---
MOVED | 1 +
databases/Makefile | 1 -
databases/mysqlwsrep56-server/Makefile | 158 ---------------------
databases/mysqlwsrep56-server/distinfo | 5 -
.../files/extra-patch-config.h.cmake | 12 --
.../mysqlwsrep56-server/files/my.cnf.sample.in | 61 --------
.../mysqlwsrep56-server/files/mysql-server.in | 81 -----------
.../mysqlwsrep56-server/files/patch-CMakeLists.txt | 42 ------
.../files/patch-client_CMakeLists.txt | 65 ---------
.../files/patch-cmake_plugin.cmake | 12 --
.../files/patch-cmake_ssl.cmake | 11 --
.../files/patch-extra_CMakeLists.txt | 13 --
.../files/patch-include_CMakeLists.txt | 15 --
.../files/patch-include_my__compare.h | 11 --
.../files/patch-include_myisam.h | 11 --
.../files/patch-libmysql_CMakeLists.txt | 41 ------
.../files/patch-libservices_CMakeLists.txt | 9 --
.../files/patch-man_CMakeLists.txt | 13 --
.../files/patch-mysys__ssl_my__default.cc | 62 --------
...ugin_password__validation_validate__password.cc | 11 --
.../files/patch-scripts_CMakeLists.txt | 36 -----
.../files/patch-scripts_mysqld__safe.sh | 24 ----
.../files/patch-sql_CMakeLists.txt | 35 -----
.../files/patch-sql_sys__vars.cc | 38 -----
.../files/patch-storage_innobase_handler_i__s.cc | 13 --
.../files/patch-support-files_CMakeLists.txt | 12 --
databases/mysqlwsrep56-server/pkg-descr | 1 -
databases/mysqlwsrep56-server/pkg-message | 8 --
databases/mysqlwsrep56-server/pkg-plist | 146 -------------------
29 files changed, 1 insertion(+), 947 deletions(-)
diff --git a/MOVED b/MOVED
index 47a7c33e8a57..df37482a2daf 100644
--- a/MOVED
+++ b/MOVED
@@ -7661,3 +7661,4 @@ lang/python37|lang/python38|2023-06-27|Has expired: Upgrade to a newer Python ve
databases/mysql-q4m||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysqlbigram||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/ateam_mysql_ldap_auth||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
+databases/mysqlwsrep56-server||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
diff --git a/databases/Makefile b/databases/Makefile
index 5eda7ff14024..a0843cb5ec25 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -221,7 +221,6 @@
SUBDIR += mysqlsla
SUBDIR += mysqltcl
SUBDIR += mysqltuner
- SUBDIR += mysqlwsrep56-server
SUBDIR += mysqlwsrep57-server
SUBDIR += mytop
SUBDIR += nagios-check_mongodb
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
deleted file mode 100644
index 0122b8eacc67..000000000000
--- a/databases/mysqlwsrep56-server/Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-PORTNAME= mysqlwsrep
-PORTVERSION?= 5.6.51
-DISTVERSIONPREFIX?= wsrep_
-DISTVERSIONSUFFIX?= -25.33
-PORTREVISION?= 1
-CATEGORIES= databases
-PKGNAMESUFFIX= 56-server
-
-MAINTAINER= devel@galeracluster.com
-COMMENT= MySQL database enhanced with Galera replication (server package)
-WWW= https://galeracluster.com/
-
-LICENSE= GPLv2
-
-DEPRECATED= Requires upstream EOL MySQL 5.6
-EXPIRATION_DATE= 2023-06-30
-NOT_FOR_ARCHS= aarch64 armv6 armv7 powerpc64
-NOT_FOR_ARCHS_REASON= error: Unsupported platform
-
-RUN_DEPENDS= bash:shells/bash \
- rsync:net/rsync \
- socat:net/socat
-LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4
-
-USES= bison \
- cmake:noninja \
- compiler:c++11-lib \
- compiler:c11 \
- mysql:56 \
- libedit \
- perl5 \
- shebangfix \
- ssl
-
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
-USE_PERL5= run
-USE_LDCONFIG= yes
-
-USE_GITHUB= yes
-GH_TUPLE?= codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
- codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src
-
-MY_DBDIR= /var/db/mysql
-MY_SECDIR= /var/db/mysql_secure
-MY_TMPDIR= /var/db/mysql_tmpdir
-
-CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
- -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
- -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
- -DINSTALL_DOCDIR="share/doc/mysql" \
- -DINSTALL_DOCREADMEDIR="share/doc/mysql" \
- -DINSTALL_INCLUDEDIR="include/mysql" \
- -DINSTALL_INFODIR="info" \
- -DINSTALL_LIBDIR="lib/mysql" \
- -DINSTALL_MANDIR="share/man" \
- -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
- -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
- -DINSTALL_MYSQLSHAREDIR="share/mysql" \
- -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
- -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
- -DINSTALL_SBINDIR="libexec" \
- -DINSTALL_SCRIPTDIR="bin" \
- -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
- -DINSTALL_SHAREDIR="share" \
- -DINSTALL_SQLBENCHDIR="share/mysql" \
- -DINSTALL_SUPPORTFILESDIR="share/mysql" \
- -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
- -DWITH_EDITLINE=system \
- -DWITH_LIBEVENT=system \
- -DWITH_LZ4=system \
- -DWITH_ZLIB=system \
- -DWITH_SSL=${OPENSSLBASE} \
- -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
- -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
- -DINSTALL_MYSQLTESTDIR=0 \
- -DWITH_LIBWRAP=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITH_WSREP=1
-
-SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*
-
-.ifdef USE_MYSQL
-.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again.
-.endif
-
-SUB_LIST= MY_DBDIR=${MY_DBDIR} \
- MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
- MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
-
-CONFLICTS_INSTALL= mariadb*-server \
- mysql*-server \
- mysqlwsrep*-server \
- percona*-server
-
-USE_RC_SUBR= mysql-server
-
-SUB_FILES= my.cnf.sample
-
-USERS= mysql
-GROUPS= mysql
-
-MMAN1= my_print_defaults.1 \
- myisam_ftdump.1 \
- myisamchk.1 \
- myisamlog.1 \
- myisampack.1 \
- mysql.server.1 \
- mysql_convert_table_format.1 \
- mysql_fix_extensions.1 \
- mysql_install_db.1 \
- mysql_plugin.1 \
- mysql_secure_installation.1 \
- mysql_setpermission.1 \
- mysql_tzinfo_to_sql.1 \
- mysql_upgrade.1 \
- mysql_zap.1 \
- mysqlbug.1 \
- mysqld_multi.1 \
- mysqld_safe.1 \
- mysqldumpslow.1 \
- mysqlhotcopy.1 \
- mysqlman.1 \
- perror.1 \
- replace.1 \
- resolve_stack_dump.1 \
- resolveip.1
-
-.include <bsd.port.options.mk>
-
-.include <bsd.port.pre.mk>
-
-# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
-# error with llmv11.
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-CFLAGS+= -fcommon
-.endif
-
-post-patch:
- ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
- ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
- ${MKDIR} ${STAGEDIR}${MY_SECDIR}
- ${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo
deleted file mode 100644
index bcb28e57b01b..000000000000
--- a/databases/mysqlwsrep56-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1617279623
-SHA256 (codership-mysql-wsrep-wsrep_5.6.51-25.33_GH0.tar.gz) = e5d8f959a2b3ece76475f4e8eb819d14b26fc53c8ce38cef63d1d2399353b727
-SIZE (codership-mysql-wsrep-wsrep_5.6.51-25.33_GH0.tar.gz) = 32718986
-SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
-SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake b/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig 2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysqlwsrep56-server/files/my.cnf.sample.in b/databases/mysqlwsrep56-server/files/my.cnf.sample.in
deleted file mode 100644
index 5d8056748079..000000000000
--- a/databases/mysqlwsrep56-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,61 +0,0 @@
-[client]
-port = 3306
-socket = /tmp/mysql.sock
-
-[mysql]
-prompt = \u@\h [\d]>\_
-no_auto_rehash
-
-[mysqld]
-user = mysql
-port = 3306
-socket = /tmp/mysql.sock
-bind-address = 127.0.0.1
-basedir = %%PREFIX%%
-datadir = %%MY_DBDIR%%
-tmpdir = %%MY_TMPDIR%%
-slave-load-tmpdir = %%MY_TMPDIR%%
-secure-file-priv = %%MY_SECDIR%%
-log-bin = mysql-bin
-log-output = TABLE
-master-info-repository = TABLE
-relay-log-info-repository = TABLE
-relay-log-recovery = 1
-slow-query-log = 1
-server-id = 1
-sync_binlog = 1
-sync_relay_log = 1
-binlog_cache_size = 16M
-expire_logs_days = 30
-log-slave-updates = 1
-enforce-gtid-consistency = 1
-gtid-mode = ON
-safe-user-create = 1
-lower_case_table_names = 1
-explicit-defaults-for-timestamp = 1
-myisam-recover-options = BACKUP,FORCE
-open_files_limit = 32768
-table_open_cache = 16384
-table_definition_cache = 8192
-net_retry_count = 16384
-key_buffer_size = 256M
-max_allowed_packet = 64M
-query_cache_type = 0
-query_cache_size = 0
-long_query_time = 0.5
-innodb_buffer_pool_size = 1G
-innodb_data_home_dir = %%MY_DBDIR%%
-innodb_log_group_home_dir = %%MY_DBDIR%%
-innodb_data_file_path = ibdata1:128M:autoextend
-innodb_flush_method = O_DIRECT
-innodb_log_file_size = 256M
-innodb_log_buffer_size = 16M
-innodb_write_io_threads = 8
-innodb_read_io_threads = 8
-innodb_autoinc_lock_mode = 2
-skip-symbolic-links
-
-[mysqldump]
-max_allowed_packet = 256M
-quote_names
-quick
diff --git a/databases/mysqlwsrep56-server/files/mysql-server.in b/databases/mysqlwsrep56-server/files/mysql-server.in
deleted file mode 100644
index e283eb35499a..000000000000
--- a/databases/mysqlwsrep56-server/files/mysql-server.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_dbdir (str): Default to "/var/db/mysql"
-# Base database directory.
-# mysql_optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-
-mysql_user="mysql"
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
-service_startup_timeout=900
-startup_sleep=1
-sst_progress_file=${mysql_dbdir}/sst_in_progress
-extra_commands="bootstrap"
-bootstrap_cmd="mysql_bootstrap"
-
-mysql_bootstrap()
-{
- # Bootstrap the cluster, start the first node that initiate the cluster
- check_startmsgs && echo "Bootstrapping cluster"
- shift
- command_args="$command_args --wsrep-new-cluster"
- run_rc_command ${_rc_prefix}start
-}
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
- [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- return 0
-}
-
-mysql_poststart()
-{
- local timeout=${service_startup_timeout}
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then
- check_startmsgs && echo "SST in progress, setting sleep higher"
- startup_sleep=100
- fi
- timeout=$(( timeout - 1 ))
- sleep $startup_sleep
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 673eaff31676..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ CMakeLists.txt
-@@ -568,12 +568,10 @@ IF(UNIX)
- ENDIF()
-
- IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
- IF(WITH_EMBEDDED_SERVER)
- ADD_SUBDIRECTORY(libmysqld)
-- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
-
-@@ -582,10 +580,7 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
-
- IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(mysql-test)
-- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
- ADD_SUBDIRECTORY(support-files)
-- ADD_SUBDIRECTORY(sql-bench)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
-@@ -644,6 +639,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- INSTALL(FILES
- README
-@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- PATTERN "mysql.info" EXCLUDE
- PATTERN "sp-imp-spec.txt" EXCLUDE
- )
-+ENDIF()
- ENDIF()
-
- INCLUDE(CPack)
diff --git a/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index d0de40f2a40a..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ client/CMakeLists.txt
-@@ -34,17 +34,20 @@ INCLUDE_DIRECTORIES(
-
-
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-
-@@ -54,17 +57,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-
-@@ -77,6 +84,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
-+ENDIF()
-
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -86,11 +94,6 @@ ENDIF(WIN32)
- SET_TARGET_PROPERTIES (
- mysql_plugin
- mysql_upgrade
-- mysqlcheck
-- mysqldump
-- mysqlimport
-- mysqlshow
-- mysqlslap
- PROPERTIES HAS_CXX TRUE)
-
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index e37fb41a9736..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig 2019-10-21 05:17:49 UTC
-+++ cmake/plugin.cmake
-@@ -223,9 +223,6 @@ MACRO(MYSQL_ADD_PLUGIN)
- MYSQL_INSTALL_TARGETS(${target}
- DESTINATION ${INSTALL_PLUGINDIR}
- COMPONENT ${INSTALL_COMPONENT})
-- INSTALL_DEBUG_TARGET(${target}
-- DESTINATION ${INSTALL_PLUGINDIR}/debug
-- COMPONENT ${INSTALL_COMPONENT})
- # Add installed files to list for RPMs
- FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 560ea06d22e3..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/ssl.cmake.orig 2019-10-21 05:17:49 UTC
-+++ cmake/ssl.cmake
-@@ -195,7 +195,7 @@ MACRO (MYSQL_CHECK_SSL)
- IF(OPENSSL_INCLUDE_DIR AND
- OPENSSL_LIBRARY AND
- CRYPTO_LIBRARY AND
-- OPENSSL_MAJOR_VERSION STREQUAL "1"
-+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
- )
- SET(OPENSSL_FOUND TRUE)
- ELSE()
diff --git a/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index c2075bc3c715..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ extra/CMakeLists.txt
-@@ -100,8 +100,10 @@ IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
- TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
- TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF()
- ENDIF()
-
diff --git a/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5ad91cba83d9..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ include/CMakeLists.txt
-@@ -72,10 +72,12 @@ SET(HEADERS
- ${HEADERS_GEN_CONFIGURE}
- )
-
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
- PATTERN "*.h"
- PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
-
-
diff --git a/databases/mysqlwsrep56-server/files/patch-include_my__compare.h b/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
deleted file mode 100644
index b01230c2b09d..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig 2019-10-21 05:17:49 UTC
-+++ include/my_compare.h
-@@ -46,7 +46,7 @@ extern "C" {
- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
-
--#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
- #define HA_MAX_KEY_SEG 16 /* Max segments for key */
-
- #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysqlwsrep56-server/files/patch-include_myisam.h b/databases/mysqlwsrep56-server/files/patch-include_myisam.h
deleted file mode 100644
index 09c51708002e..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig 2019-10-21 05:17:49 UTC
-+++ include/myisam.h
-@@ -56,7 +56,7 @@ extern "C" {
- The following defines can be increased if necessary.
- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
- #define MI_MAX_KEY_SEG 16 /* Max segments for key */
-
- #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 6811d02c853d..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- libmysql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ libmysql/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(WIN32)
- ENDIF()
-
- # Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
-
- # Visual Studio users need debug static library for debug projects
-@@ -234,19 +234,22 @@ IF(UNIX)
- ENDMACRO()
- ENDIF()
-
-+IF (FALSE)
- IF(UNIX)
- GET_TARGET_NAME(mysqlclient lib_name)
- INSTALL_SYMLINK(mysqlclient
- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
- ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
-
- IF(NOT DISABLE_SHARED)
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
- EXPORTS ${CLIENT_API_FUNCTIONS}
-- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries NOINSTALL)
-+ IF (FALSE)
- TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
- IF(UNIX)
- # libtool compatability
-@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
- ${INSTALL_LIBDIR} SharedLibraries)
- ENDFOREACH()
- ENDIF()
-+ ENDIF()
- ENDIF()
diff --git a/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fd69b64c6314..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ libservices/CMakeLists.txt
-@@ -31,4 +31,6 @@ SET(MYSQLSERVICES_SOURCES
- mysql_string_service.c)
-
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index a3ee5ced8655..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ man/CMakeLists.txt
-@@ -21,9 +21,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
-+FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index fad1292c950f..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,62 +0,0 @@
---- mysys_ssl/my_default.cc.orig 2019-10-21 05:17:49 UTC
-+++ mysys_ssl/my_default.cc
-@@ -128,7 +128,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
- #endif /* WITH_WREP */
- /* Which directories are searched for options (and in which order) */
-
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
- static const char **default_directories = NULL;
-
-@@ -933,6 +933,14 @@ static int search_default_file_with_ext(Process_option
- strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
- #endif /* WITH_WSREP */
-
-+ if (strstr(name, "/etc") == name)
-+ {
-+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
-+ goto err;
-+ }
-+
- while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
- {
- line++;
-@@ -1271,7 +1279,8 @@ void my_print_default_files(const char *conf_file)
- end[(strlen(end)-1)] = ' ';
- else
- strxmov(end, conf_file, *ext , " ", NullS);
-- fputs(name, stdout);
-+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
- }
- }
- }
-@@ -1430,14 +1439,9 @@ static const char **init_default_directories(MEM_ROOT
-
- #else
-
-- errors += add_directory(alloc, "/etc/", dirs);
-- errors += add_directory(alloc, "/etc/mysql/", dirs);
-+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
-
--#if defined(DEFAULT_SYSCONFDIR)
-- if (DEFAULT_SYSCONFDIR[0])
-- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
--
- #endif
-
- if ((env= getenv("MYSQL_HOME")))
-@@ -1507,7 +1511,7 @@ int check_file_permissions(const char *file_name, my_b
- MY_STAT stat_info;
-
- if (!my_stat(file_name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore .mylogin.cnf file if not exclusively readable/writable
- by current user.
diff --git a/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
deleted file mode 100644
index ac29f654290e..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig 2019-10-21 05:17:49 UTC
-+++ plugin/password_validation/validate_password.cc
-@@ -23,6 +23,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <ios> // std::streamoff
- #include <iostream>
diff --git a/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 55ab59b29f1f..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- scripts/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ scripts/CMakeLists.txt
-@@ -311,6 +311,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
- GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
- STRING(REGEX REPLACE "^lib" "" lib "${lib}")
- SET(${var} "${${var}}-l${lib} " )
-+ ELSEIF(lib STREQUAL "-pthread")
-+ SET(${var} "${${var}}-pthread " )
- ELSE()
- SET(${var} "${${var}}-l${lib} " )
- ENDIF()
-@@ -373,15 +375,10 @@ ELSE()
- # On Unix, most of the files end up in the bin directory
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(BIN_SCRIPTS
-- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_zap
-- mysqlaccess
-- mysqlaccess.conf
- mysql_convert_table_format
-- mysql_find_rows
- mysqlhotcopy
- mysqldumpslow
- mysqld_multi
-@@ -391,7 +388,7 @@ ELSE()
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
-- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
- ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
- ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh b/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index e0aa5e3fa845..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig 2019-07-19 08:39:37 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,10 +568,10 @@ fi
-
- if test -z "$MYSQL_HOME"
- then
-- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
- then
- log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
-
-@@ -580,7 +580,7 @@ IGNORING $DATADIR/my.cnf"
- then
- log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
- MYSQL_HOME=$DATADIR
- else
- MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index d46620dfd4c8..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- sql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
-+++ sql/CMakeLists.txt
-@@ -442,7 +442,7 @@ ADD_CUSTOM_TARGET(
- DEPENDS ${GEN_DIGEST_SOURCES}
- )
-
--
-+IF(FALSE)
- MYSQL_ADD_PLUGIN(udf_example udf_example.cc
- MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
- IF(NOT DISABLE_SHARED)
-@@ -452,6 +452,7 @@ IF(NOT DISABLE_SHARED)
- "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
- ENDIF()
- ENDIF()
-+ENDIF()
-
- FOREACH(tool gtar tar git)
- STRING(TOUPPER ${tool} TOOL)
-@@ -477,6 +478,7 @@ ADD_CUSTOM_TARGET(distclean
-
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -519,6 +521,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
- ELSE()
- # Not windows or cross compiling, just install an empty directory
- INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
-+ENDIF()
- ENDIF()
- ENDIF()
-
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 872524393853..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig 2019-10-21 05:17:49 UTC
-+++ sql/sys_vars.cc
-@@ -1422,7 +1422,7 @@ static Sys_var_ulong Sys_interactive_timeout(
- "connection before closing it",
- SESSION_VAR(net_interactive_timeout),
- CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-
- static Sys_var_ulong Sys_join_buffer_size(
- "join_buffer_size",
-@@ -2041,7 +2041,7 @@ static Sys_var_ulong Sys_net_read_timeout(
- "Number of seconds to wait for more data from a connection before "
- "aborting the read",
- SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_net_read_timeout));
-
-@@ -2056,7 +2056,7 @@ static Sys_var_ulong Sys_net_write_timeout(
- "Number of seconds to wait for a block to be written to a connection "
- "before aborting the write",
- SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
- NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
- ON_UPDATE(fix_net_write_timeout));
-
-@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
- "The number of seconds the server waits for activity on a "
- "connection before closing it",
- SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
-- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+ VALID_RANGE(1, INT_MAX32/1000),
- DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc b/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc
deleted file mode 100644
index 8f6f031af3e9..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/handler/i_s.cc.orig 2020-05-23 20:11:13 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"
diff --git a/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
*** 189 LINES SKIPPED ***