diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-12-29 20:37:41 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-12-31 00:06:11 +0000 |
| commit | 74b5232a29e953d91f9b0bba4a1e5d6dcdd915cb (patch) | |
| tree | ade775383bc4637ed49a3fbcc9e0a0b0ad7ac57f | |
| parent | 7b9d7322b69e2d1e9cd4cc41d4803c6469785307 (diff) | |
| download | ports-74b5232a29e953d91f9b0bba4a1e5d6dcdd915cb.tar.gz ports-74b5232a29e953d91f9b0bba4a1e5d6dcdd915cb.zip | |
databases/mysqlwsrep57-server: Remove expired port
Depends on upstream EOL MySQL 5.7.
41 files changed, 7 insertions, 1187 deletions
@@ -8188,3 +8188,4 @@ comms/openzwave-devel||2023-12-28|Has expired: Upstream no longer maintained, in net/net/dpdk-22.11|net/dpdk|2023-12-30|Instead of expiring dpdk move dpdk-22.11 to dpdk databases/ateam_mysql57_ldap_auth||2023-12-31|Depends on upstream EOL MySQL 5.7 databases/mysql-udf||2023-12-31|Has expired: Upstream last update was in 2007 +databases/mysqlwsrep57-server||2023-12-31|Depends on upstream EOL MySQL 5.7 diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 5f805aa3fd6c..4d14702ffc81 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -90,7 +90,7 @@ WITH_MYSQL_FLAVOUR= mariadb WITH_MYSQL_FLAVOUR= mysql . endif . if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} -IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mw]//}-client +IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[m]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[m]//}-client . endif MYSQL_VER= ${_WANT_MYSQL_VER} . elif defined(WITH_MYSQL_VER) @@ -111,7 +111,7 @@ MYSQL_FLAVOUR= mysql . if defined(_MYSQL_VER) . if ${_MYSQL_VER} != ${MYSQL_VER} -IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mw]//}-client +IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[m]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[m]//}-client . endif . endif @@ -122,9 +122,6 @@ _MYSQL_CLIENT_FLAVOUR= mariadb . if ${MYSQL_VER:C/m//} >= 105 _MYSQL_SHLIB= libmariadb . endif -. elif (${MYSQL_VER:C/[0-9]*//} == "w") -_MYSQL_SERVER_FLAVOUR= mysqlwsrep -_MYSQL_CLIENT_FLAVOUR= mysql . else _MYSQL_SERVER_FLAVOUR= mysql _MYSQL_CLIENT_FLAVOUR= mysql diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index ba10e8bbd983..0a5afcb26df9 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -105,7 +105,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 -# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m, 5.7w +# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja diff --git a/databases/Makefile b/databases/Makefile index 51abc4af5317..d33435d9307b 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -205,7 +205,6 @@ SUBDIR += mysqlsla SUBDIR += mysqltcl SUBDIR += mysqltuner - SUBDIR += mysqlwsrep57-server SUBDIR += mytop SUBDIR += nagios-check_mongodb SUBDIR += nagios-check_postgres_replication diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile index 159548452f64..6d2c508ec098 100644 --- a/databases/mroonga/Makefile +++ b/databases/mroonga/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:configure LIB_DEPENDS= libgroonga.so:textproc/groonga USES= compiler:c11 libtool mysql pkgconfig shebangfix -IGNORE_WITH_MYSQL= 105m 106m 1011m 57w 81 +IGNORE_WITH_MYSQL= 105m 106m 1011m 81 SHEBANG_FILES= data/rpm/post.sh data/rpm/preun.sh diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile index a5275bab9275..d08228f3f0e4 100644 --- a/databases/mysql-connector-odbc-80/Makefile +++ b/databases/mysql-connector-odbc-80/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \ libzstd.so:archivers/zstd USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl -IGNORE_WITH_MYSQL= 57 57w +IGNORE_WITH_MYSQL= 57 USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1 diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile deleted file mode 100644 index 4ac29c7b9457..000000000000 --- a/databases/mysqlwsrep57-server/Makefile +++ /dev/null @@ -1,201 +0,0 @@ -PORTNAME= mysqlwsrep -DISTVERSION?= 5.7.43 -DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.35 -PORTREVISION= 0 -CATEGORIES= databases -MASTER_SITES+= SF/boost/boost/1.59.0:boost -PKGNAMESUFFIX= 57-server -DISTFILES+= boost_1_59_0${EXTRACT_SUFX}:boost - -MAINTAINER= devel@galeracluster.com -COMMENT= MySQL database enhanced with Galera replication (server package) -WWW= https://galeracluster.com/ - -LICENSE= GPLv2 - -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 \ - libedit \ - mysql:57 \ - perl5 \ - shebangfix \ - ssl - -USE_PERL5= run - -MY_DBDIR= /var/db/mysql -MY_SECDIR= /var/db/mysql_secure -MY_TMPDIR= /var/db/mysql_tmpdir - -USE_GITHUB= yes -GH_TUPLE?= codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ - codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src - -DATADIR= ${PREFIX}/share/mysql -ETCDIR= ${PREFIX}/etc/mysql - -CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ - -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ - -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="share/man" \ - -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ - -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ - -DWITH_BOOST="${WRKDIR}/boost_1_59_0" \ - -DWITH_EDITLINE=system \ - -DWITH_LIBEVENT=system \ - -DWITH_LZ4=system \ - -DWITH_ZLIB=system \ - -DINSTALL_MYSQLTESTDIR=0 \ - -DDOWNLOAD_BOOST=1 \ - -DWITH_WSREP=1 \ - -DWITH_INNODB_MEMCACHED=0 - -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 \ - mysqlwsrep56-server \ - percona*-server - -USE_RC_SUBR= mysql-server - -SUB_FILES= my.cnf.sample - -USERS= mysql -GROUPS= mysql - -USE_CXXSTD= c++11 -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin - -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 - -OPTIONS_GROUP= STORAGE -OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA -OPTIONS_SUB= YES -STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) -ARCHIVE_DESC= Compile "Archive Storage" statically in server -BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server -EXAMPLE_DESC= Compile "Example Storage" statically in server -FEDERATED_DESC= Compile "Federated Storage" statically in server -INNOBASE_DESC= Compile "InnoDB Storage" statically in server -PARTITION_DESC= Compile "Partitioning support Storage" statically in server -PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server - -ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 -BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 -FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 -INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 -PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 -PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 - -OPTIONS_GROUP+= FEATURES -OPTIONS_GROUP_FEATURES= PERFSCHM -FEATURES_DESC= Default features knobs -PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) -OPTIONS_DEFAULT+= PERFSCHM -FEDERATED_SUB_LIST+= FEDER="--federated" -FEDERATED_SUB_LIST_OFF+=FEDER="" - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPERFSCHM} -SUB_LIST+= PERFSCHEMRC="" -.else -SUB_LIST+= PERFSCHEMRC="--skip-performance-schema" -.endif - -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -CMAKE_ARGS+= -DWITH_SSL=system -.else -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} -.endif - -# ${LOCALBASE}/include/lz4.h does not compile with Clang 6. -# Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used. -CFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -LDFLAGS+= -L${LOCALBASE}/lib -.if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-c++11-narrowing -.endif - -# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker -# error with llmv11. -.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109) || ${CHOSEN_COMPILER_TYPE} == gcc -CFLAGS+= -fcommon -.endif - -post-extract: - ${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h - -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} - -.include <bsd.port.post.mk> diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo deleted file mode 100644 index 7c1aa097b4e9..000000000000 --- a/databases/mysqlwsrep57-server/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1692366012 -SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac -SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.43-25.35_GH0.tar.gz) = c41869735ecac2ac41c51359fb2984652a4f27d274d9e017f3120c3b37686a22 -SIZE (codership-mysql-wsrep-wsrep_5.7.43-25.35_GH0.tar.gz) = 56937217 -SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 -SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 diff --git a/databases/mysqlwsrep57-server/files/my.cnf.sample.in b/databases/mysqlwsrep57-server/files/my.cnf.sample.in deleted file mode 100644 index 55ba041bbc7b..000000000000 --- a/databases/mysqlwsrep57-server/files/my.cnf.sample.in +++ /dev/null @@ -1,62 +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 -default_password_lifetime = 0 -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_temp_data_file_path = ibtmp1: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/mysqlwsrep57-server/files/mysql-server.in b/databases/mysqlwsrep57-server/files/mysql-server.in deleted file mode 100644 index eafc47dd2665..000000000000 --- a/databases/mysqlwsrep57-server/files/mysql-server.in +++ /dev/null @@ -1,98 +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 "%%MY_DBDIR%%" -# Base database directory. -# mysql_confdir (str): Default to "%%ETCDIR%%" -# Base configuration directory. -# mysql_optfile (str): Server-specific option file. -# Set it in the rc.conf or default behaviour of -# `mysqld_safe` itself, will be picking -# ${mysql_confdir}/my.cnf if it exists. -# 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). -# mysql_startup_timeout (int): How much time, in seconds, should -# we wait for mysqld to start (default 900). -# - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_dbdir="%%MY_DBDIR%%"} -: ${mysql_confdir="%%ETCDIR%%"} -if [ -f "${mysql_confdir}/my.cnf" ]; then -: ${mysql_optfile="${mysql_confdir}/my.cnf"} -elif [ -f "${mysql_dbdir}/my.cnf" ]; then -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} -fi -if [ ! -z "${mysql_optfile}" ]; then -mysql_extra="--defaults-extra-file=${mysql_optfile}" -fi - -mysql_user="mysql" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="${procname}" -mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user} --initialize" -: ${mysql_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 initiates 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 -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - return 0 -} - -mysql_poststart() -{ - local timeout=${mysql_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/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt deleted file mode 100644 index 6752c25fcd24..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2021-06-16 10:56:53 UTC -+++ CMakeLists.txt -@@ -712,12 +712,10 @@ IF(UNIX) - ENDIF() - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(testclients) - 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() - -@@ -726,8 +724,6 @@ ENDIF() - ADD_SUBDIRECTORY(scripts) - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) -@@ -786,6 +782,7 @@ ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES - README -@@ -807,6 +804,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/mysqlwsrep57-server/files/patch-client_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index 4f8c6ebba7ef..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ client/CMakeLists.txt -@@ -38,17 +38,17 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - - ## Subdirectory with common client code. - ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) - - INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) -+ENDIF() - - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -69,6 +69,7 @@ ADD_DEPENDENCIES(mysqltest GenError) - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -81,10 +82,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - - 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) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -101,6 +104,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -116,9 +120,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) - ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) - ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) - SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) -+ENDIF() - - # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". - IF(WIN32) -@@ -127,11 +133,6 @@ ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 6778523e0797..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,31 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2020-10-07 08:29:27 UTC -+++ cmake/os/FreeBSD.cmake -@@ -45,6 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") - ENDIF() -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ >= 4); -+ }" I386_ATOMIC_BUILTINS) -+ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) -+ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") -+ ENDIF() -+ ELSEIF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") - ENDIF() -@@ -53,4 +67,6 @@ ENDIF() - # Should not be needed any more, but kept for easy resurrection if needed - # #Legacy option, maybe not needed anymore , taken as is from autotools build - # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) -- -+# For GCC maybe it's also good idea to use -+# ADD_DEFINITIONS(-D_GNU_SOURCE) -+ diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake deleted file mode 100644 index 5cb4a2dfe778..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/plugin.cmake.orig 2019-10-21 05:21:41 UTC -+++ cmake/plugin.cmake -@@ -282,9 +282,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/mysqlwsrep57-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0dc10db09610..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake/ssl.cmake.orig 2020-05-27 10:17:47 UTC -+++ cmake/ssl.cmake -@@ -206,6 +206,12 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION STREQUAL "1" - ) - SET(OPENSSL_FOUND TRUE) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" -+ ) -+ SET(OPENSSL_FOUND TRUE) - ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() diff --git a/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index e77c3b510e4c..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- include/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ include/CMakeLists.txt -@@ -76,14 +76,13 @@ SET(HEADERS - ${HEADERS_GEN_CONFIGURE} - ) - -+IF(FALSE) - INSTALL(FILES - ../libbinlogevents/export/binary_log_types.h - DESTINATION ${INSTALL_INCLUDEDIR} -- COMPONENT Development) --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/mysqlwsrep57-server/files/patch-include_my__compare.h b/databases/mysqlwsrep57-server/files/patch-include_my__compare.h deleted file mode 100644 index 24205abdee3e..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2019-10-21 05:21:41 UTC -+++ include/my_compare.h -@@ -47,7 +47,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/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h b/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h deleted file mode 100644 index 08e6cd474251..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/my_thread_os_id.h.orig 2019-10-21 05:21:41 UTC -+++ include/my_thread_os_id.h -@@ -88,8 +88,12 @@ static inline my_thread_os_id_t my_thread_os_id() - return pthread_getthreadid_np(); - #else - #ifdef HAVE_INTEGER_PTHREAD_SELF -+# ifdef __DragonFly__ -+ return syscall(SYS_lwp_gettid); -+# else - /* Unknown platform, fallback. */ - return pthread_self(); -+# endif - #else - /* Feature not available. */ - return 0; diff --git a/databases/mysqlwsrep57-server/files/patch-include_myisam.h b/databases/mysqlwsrep57-server/files/patch-include_myisam.h deleted file mode 100644 index 228303eaf909..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2019-10-21 05:21:41 UTC -+++ include/myisam.h -@@ -52,7 +52,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/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 9e643a62c1f6..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ libmysql/CMakeLists.txt -@@ -262,11 +262,11 @@ IF(WIN32) - ENDIF() - - # LDAP authentication SASL client plugin --MESSAGE(STATUS "Creating LDAP authentication SASL client library.") --ADD_SUBDIRECTORY(authentication_ldap) -+# MESSAGE(STATUS "Creating LDAP authentication SASL client library.") -+# ADD_SUBDIRECTORY(authentication_ldap) - - # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) - TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) - - # Visual Studio users need debug static library for debug projects -@@ -312,8 +312,9 @@ IF(NOT DISABLE_SHARED) - # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries SKIP_INSTALL) - TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) -+ IF (FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -357,6 +358,7 @@ IF(NOT DISABLE_SHARED) - SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) - SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) - -+ ENDIF() - ENDIF() - ENDIF() - diff --git a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 11217752c637..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ libservices/CMakeLists.txt -@@ -47,4 +47,6 @@ SET(MYSQLSERVICES_SOURCES - mysql_keyring_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 990d98e30a8a..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2019-10-21 05:21:41 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 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/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index bc88fe7a0b30..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc +++ /dev/null @@ -1,62 +0,0 @@ ---- mysys_ssl/my_default.cc.orig 2021-06-16 10:56:53 UTC -+++ mysys_ssl/my_default.cc -@@ -132,7 +132,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; - -@@ -948,6 +948,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++; -@@ -1290,7 +1298,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); - } - } - } -@@ -1449,14 +1458,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"))) -@@ -1526,7 +1530,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/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc deleted file mode 100644 index 02a0b12caecb..000000000000 --- a/databases/mysqlwsrep57-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:21:41 UTC -+++ plugin/password_validation/validate_password.cc -@@ -25,6 +25,8 @@ - #include <mysql/plugin_validate_password.h> - #include <mysql/service_my_plugin_log.h> - #include <mysql/service_mysql_string.h> -+/* solve clash between libc++ bitset::test() and test macro from my_global.h */ -+#undef test - #include <set> - #include <iostream> - #include <fstream> diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc deleted file mode 100644 index fd5f2169b959..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2021-06-16 10:56:53 UTC -+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc -@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre - donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"), - 0, - NULL, NULL, -+ false, - NULL, - NULL, - NULL, -@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre - NULL, - NULL, - NULL, -- NULL, -- NULL, -+ false, - DEFAULT_THREAD_PRIORITY, - 1, false, true, true); - diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake deleted file mode 100644 index 52deee94ce89..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- rapid/plugin/x/mysqlx_configure.cmake.orig 2019-10-21 05:21:41 UTC -+++ rapid/plugin/x/mysqlx_configure.cmake -@@ -42,6 +42,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername - CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h ) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -@@ -53,3 +54,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -+ENDIF() diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt deleted file mode 100644 index bed7d2f42c67..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ rapid/unittest/gunit/xplugin/CMakeLists.txt -@@ -78,7 +78,6 @@ ADD_DEFINITIONS( - ) - - INCLUDE_DIRECTORIES(SYSTEM -- ${BOOST_INCLUDE_DIR} - ${PROTOBUF_INCLUDE_DIRS} - ${SSL_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIRS} -@@ -88,6 +87,7 @@ INCLUDE_DIRECTORIES(SYSTEM - ) - - INCLUDE_DIRECTORIES( -+ ${BOOST_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/testing/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 2c76de951e7e..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2021-06-16 10:56:53 UTC -+++ scripts/CMakeLists.txt -@@ -330,6 +330,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() -@@ -422,14 +424,13 @@ ELSE() - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -+ - IF(WITH_SYSTEMD) - SET(BIN_SCRIPTS -- mysql_config - mysqldumpslow - ) - ELSE() - SET(BIN_SCRIPTS -- mysql_config - mysqldumpslow - mysqld_multi - mysqld_safe -@@ -473,7 +474,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/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index e3b27523cfbe..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- sql/CMakeLists.txt.orig 2021-06-16 10:56:53 UTC -+++ sql/CMakeLists.txt -@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/regex - ${SSL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/sql -+ ${CMAKE_BINARY_DIR}/include -+ ${CMAKE_BINARY_DIR} - ${WSREP_INCLUDES} - ${LZ4_INCLUDE_DIR} - ) -@@ -663,6 +665,7 @@ ADD_CUSTOM_TARGET( - ) - - -+IF(FALSE) - MYSQL_ADD_PLUGIN(udf_example udf_example.cc - MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example") - IF(NOT DISABLE_SHARED) -@@ -671,6 +674,7 @@ IF(NOT DISABLE_SHARED) - PROPERTIES LINK_FLAGS - "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def") - ENDIF() -+ENDIF() - ENDIF() - - MYSQL_ADD_PLUGIN(locking_service locking_service_udf.cc diff --git a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc deleted file mode 100644 index 5afdb1cfd53e..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- sql/conn_handler/socket_connection.cc.orig 2019-10-21 05:21:41 UTC -+++ sql/conn_handler/socket_connection.cc -@@ -953,22 +953,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne - signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, - mysql_socket_getfd(connect_sock), NULL); -- fromhost(&req); -+ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; -+ my_fromhost(&req); - -- if (!hosts_access(&req)) -+ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; -+ if (!my_hosts_access(&req)) - { - /* - This may be stupid but refuse() includes an exit(0) - which we surely don't want... - clean_exit() - same stupid thing ... - */ -+ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; - syslog(LOG_AUTH | m_deny_severity, -- "refused connect from %s", eval_client(&req)); -+ "refused connect from %s", my_eval_client(&req)); - - #ifdef HAVE_LIBWRAP_PROTOTYPES - // Some distros have patched tcpd.h to have proper prototypes - if (req.sink) -- (req.sink)(req.fd); -+ ((void (*)(int)) (req.sink))(req.fd); - #else - // Some distros have not patched tcpd.h - if (req.sink) diff --git a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc deleted file mode 100644 index e33c2943509a..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/locks/shared_spin_lock.cc.orig 2021-06-22 10:50:24 UTC -+++ sql/locks/shared_spin_lock.cc -@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or - { - this->spin_exclusive_lock(); - } --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined(__FreeBSD__) - my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); - #else - my_atomic_store64(&this->m_exclusive_owner, self); diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index 52c636089b2d..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2021-06-16 10:56:53 UTC -+++ sql/sys_vars.cc -@@ -1749,7 +1749,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", -@@ -2629,7 +2629,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)); - -@@ -2653,7 +2653,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)); - -@@ -4389,7 +4389,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/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc b/databases/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc deleted file mode 100644 index 3f64304a02db..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- sql/wsrep_utils.cc.orig 2017-06-12 10:31:29 UTC -+++ sql/wsrep_utils.cc -@@ -26,6 +26,7 @@ - #include <sql_class.h> - #include <socket_connection.h> - -+#include <signal.h> - #include <spawn.h> // posix_spawn() - #include <unistd.h> // pipe() - #include <errno.h> // errno diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc deleted file mode 100644 index 05b88083b2b0..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/innobase/fsp/fsp0fsp.cc.orig 2020-11-02 10:59:53 UTC -+++ storage/innobase/fsp/fsp0fsp.cc -@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info( - - if (elen == MY_AES_BAD_DATA) { - my_free(master_key); -- return(NULL); -+ return(false); - } - - /* Check checksum bytes. */ diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h deleted file mode 100644 index 4554b5dd3490..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/innobase/include/srv0mon.h.orig 2019-10-21 05:21:41 UTC -+++ storage/innobase/include/srv0mon.h -@@ -41,6 +41,10 @@ Created 12/15/2009 Jimmy Yang - /* Required for FreeBSD so that INT64_MAX is defined. */ - #define __STDC_LIMIT_MACROS - #endif /* __STDC_LIMIT_MACROS */ -+#ifdef __DragonFly__ -+/* The hack above doen't work for dragonfly, stdint.h already imported */ -+#include <machine/int_limits.h> -+#endif - - #include <stdint.h> - diff --git a/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 6608a5526c77..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2019-10-21 05:21:41 UTC -+++ storage/myisam/mi_dynrec.c -@@ -72,18 +72,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size) - DBUG_RETURN(1); - } - /* -- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: -- MAP_NORESERVE -- Do not reserve swap space for this mapping. When swap space is -- reserved, one has the guarantee that it is possible to modify the -- mapping. When swap space is not reserved one might get SIGSEGV -- upon a write if no physical memory is available. -+ MAP_NORESERVE is unimplemented in FreeBSD - */ - info->s->file_map= (uchar*) - my_mmap(0, (size_t) size, - info->s->mode==O_RDONLY ? PROT_READ : - PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE, -+ MAP_SHARED, - info->dfile, 0L); - if (info->s->file_map == (uchar*) MAP_FAILED) - { diff --git a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index cbb532b82281..000000000000 --- a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC -+++ support-files/CMakeLists.txt -@@ -67,7 +67,9 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) diff --git a/databases/mysqlwsrep57-server/pkg-descr b/databases/mysqlwsrep57-server/pkg-descr deleted file mode 100644 index 5b91c862675f..000000000000 --- a/databases/mysqlwsrep57-server/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -MySQL is a very fast, multi-threaded, multi-user and robust SQL -(Structured Query Language) database server. - -Modified to support replication using the Galera library. diff --git a/databases/mysqlwsrep57-server/pkg-message b/databases/mysqlwsrep57-server/pkg-message deleted file mode 100644 index e619c93e68e7..000000000000 --- a/databases/mysqlwsrep57-server/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: upgrade - message: <<EOM -Remember to run mysql_upgrade the first time you start the MySQL server -after an upgrade from an earlier version. -EOM -} -] diff --git a/databases/mysqlwsrep57-server/pkg-plist b/databases/mysqlwsrep57-server/pkg-plist deleted file mode 100644 index 8b9a2bae2504..000000000000 --- a/databases/mysqlwsrep57-server/pkg-plist +++ /dev/null @@ -1,171 +0,0 @@ -bin/innochecksum -bin/lz4_decompress -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql_install_db -bin/mysql_plugin -bin/mysql_secure_installation -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -bin/mysqld_multi -bin/mysqld_safe -bin/mysqldumpslow -bin/mysqltest -bin/mysqlxtest -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -bin/zlib_decompress -bin/wsrep_recover -bin/wsrep_sst_common -bin/wsrep_sst_mysqldump -bin/wsrep_sst_rsync -bin/wsrep_sst_xtrabackup -bin/wsrep_sst_xtrabackup-v2 -lib/mysql/plugin/adt_null.so -lib/mysql/plugin/audit_log.so -lib/mysql/plugin/auth.so -lib/mysql/plugin/auth_pam.so -lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/connection_control.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/group_replication.so -%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so -lib/mysql/plugin/keyring_file.so -lib/mysql/plugin/keyring_udf.so -lib/mysql/plugin/libdaemon_example.so -lib/mysql/plugin/libtest_framework.so -lib/mysql/plugin/libtest_services.so -lib/mysql/plugin/libtest_services_threaded.so -lib/mysql/plugin/libtest_session_detach.so -lib/mysql/plugin/libtest_session_in_thd.so -lib/mysql/plugin/libtest_session_info.so -lib/mysql/plugin/libtest_sql_2_sessions.so -lib/mysql/plugin/libtest_sql_all_col_types.so -lib/mysql/plugin/libtest_sql_cmds_1.so -lib/mysql/plugin/libtest_sql_commit.so -lib/mysql/plugin/libtest_sql_complex.so -lib/mysql/plugin/libtest_sql_errors.so -lib/mysql/plugin/libtest_sql_lock.so -lib/mysql/plugin/libtest_sql_processlist.so -lib/mysql/plugin/libtest_sql_replication.so -lib/mysql/plugin/libtest_sql_shutdown.so -lib/mysql/plugin/libtest_sql_sqlmode.so -lib/mysql/plugin/libtest_sql_stored_procedures_functions.so -lib/mysql/plugin/libtest_sql_views_triggers.so -lib/mysql/plugin/libtest_x_sessions_deinit.so -lib/mysql/plugin/libtest_x_sessions_init.so -lib/mysql/plugin/locking_service.so -lib/mysql/plugin/mypluglib.so -lib/mysql/plugin/mysql_no_login.so -lib/mysql/plugin/mysqlx.so -lib/mysql/plugin/qa_auth_client.so -lib/mysql/plugin/qa_auth_interface.so -lib/mysql/plugin/qa_auth_server.so -lib/mysql/plugin/replication_observers_example_plugin.so -lib/mysql/plugin/rewrite_example.so -lib/mysql/plugin/rewriter.so -lib/mysql/plugin/semisync_master.so -lib/mysql/plugin/semisync_slave.so -lib/mysql/plugin/test_security_context.so -lib/mysql/plugin/test_udf_services.so -lib/mysql/plugin/validate_password.so -lib/mysql/plugin/version_token.so -libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc -libexec/mysqld -share/man/man1/my_print_defaults.1.gz -share/man/man1/myisam_ftdump.1.gz -share/man/man1/myisamchk.1.gz -share/man/man1/myisamlog.1.gz -share/man/man1/myisampack.1.gz -share/man/man1/mysql.server.1.gz -share/man/man1/mysql_install_db.1.gz -share/man/man1/mysql_plugin.1.gz -share/man/man1/mysql_secure_installation.1.gz -share/man/man1/mysql_tzinfo_to_sql.1.gz -share/man/man1/mysql_upgrade.1.gz -share/man/man1/mysqld_multi.1.gz -share/man/man1/mysqld_safe.1.gz -share/man/man1/mysqldumpslow.1.gz -share/man/man1/mysqlman.1.gz -share/man/man1/perror.1.gz -share/man/man1/replace.1.gz -share/man/man1/resolve_stack_dump.1.gz -share/man/man1/resolveip.1.gz -share/man/man8/mysqld.8.gz -%%DATADIR%%/bulgarian/errmsg.sys -%%DATADIR%%/charsets/Index.xml -%%DATADIR%%/charsets/README -%%DATADIR%%/charsets/armscii8.xml -%%DATADIR%%/charsets/ascii.xml -%%DATADIR%%/charsets/cp1250.xml -%%DATADIR%%/charsets/cp1251.xml -%%DATADIR%%/charsets/cp1256.xml -%%DATADIR%%/charsets/cp1257.xml -%%DATADIR%%/charsets/cp850.xml -%%DATADIR%%/charsets/cp852.xml -%%DATADIR%%/charsets/cp866.xml -%%DATADIR%%/charsets/dec8.xml -%%DATADIR%%/charsets/geostd8.xml -%%DATADIR%%/charsets/greek.xml -%%DATADIR%%/charsets/hebrew.xml -%%DATADIR%%/charsets/hp8.xml -%%DATADIR%%/charsets/keybcs2.xml -%%DATADIR%%/charsets/koi8r.xml -%%DATADIR%%/charsets/koi8u.xml -%%DATADIR%%/charsets/latin1.xml -%%DATADIR%%/charsets/latin2.xml -%%DATADIR%%/charsets/latin5.xml -%%DATADIR%%/charsets/latin7.xml -%%DATADIR%%/charsets/macce.xml -%%DATADIR%%/charsets/macroman.xml -%%DATADIR%%/charsets/swe7.xml -%%DATADIR%%/czech/errmsg.sys -%%DATADIR%%/danish/errmsg.sys -%%DATADIR%%/dictionary.txt -%%DATADIR%%/dutch/errmsg.sys -%%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt -%%DATADIR%%/estonian/errmsg.sys -%%DATADIR%%/fill_help_tables.sql -%%DATADIR%%/french/errmsg.sys -%%DATADIR%%/german/errmsg.sys -%%DATADIR%%/greek/errmsg.sys -%%DATADIR%%/hungarian/errmsg.sys -%%DATADIR%%/innodb_memcached_config.sql -%%DATADIR%%/install_rewriter.sql -%%DATADIR%%/italian/errmsg.sys -%%DATADIR%%/japanese/errmsg.sys -%%DATADIR%%/korean/errmsg.sys -%%DATADIR%%/magic -%%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql.server -%%DATADIR%%/mysql_security_commands.sql -%%DATADIR%%/mysql_sys_schema.sql -%%DATADIR%%/mysql_system_tables.sql -%%DATADIR%%/mysql_system_tables_data.sql -%%DATADIR%%/mysql_test_data_timezone.sql -%%DATADIR%%/mysqld_multi.server -%%DATADIR%%/norwegian-ny/errmsg.sys -%%DATADIR%%/norwegian/errmsg.sys -%%DATADIR%%/polish/errmsg.sys -%%DATADIR%%/portuguese/errmsg.sys -%%DATADIR%%/romanian/errmsg.sys -%%DATADIR%%/russian/errmsg.sys -%%DATADIR%%/serbian/errmsg.sys -%%DATADIR%%/slovak/errmsg.sys -%%DATADIR%%/spanish/errmsg.sys -%%DATADIR%%/swedish/errmsg.sys -%%DATADIR%%/ukrainian/errmsg.sys -%%DATADIR%%/uninstall_rewriter.sql -%%DATADIR%%/wsrep_diag.sql -%%DATADIR%%/wsrep_notify -@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample -@dir(mysql,mysql,0750) %%ETCDIR%%/keyring -@dir(mysql,mysql,0750) %%MY_SECDIR%% -@dir(mysql,mysql,0750) %%MY_TMPDIR%% diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 851f7e430afb..1d908a831e3f 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -105,7 +105,7 @@ MYSQL_INTERNAL_USES= mysql:server MYSQL_INTERNAL_CMAKE_BOOL= ENABLE_INTERNALMYSQL # Only works with MariaDB. Try to keep this in sync with supported MySQL # versions and add any version not ending with 'm' to the IGNORE list. -MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="57 80 81 57w" +MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="57 80 81" MYSQL_INTERNAL_IMPLIES= MYSQL NLS_DESC= Digikam i18n translations |