diff options
Diffstat (limited to 'databases/mariadb106-server/files')
11 files changed, 390 insertions, 0 deletions
diff --git a/databases/mariadb106-server/files/client.cnf.sample.in b/databases/mariadb106-server/files/client.cnf.sample.in new file mode 100644 index 000000000000..2513f6a04fb2 --- /dev/null +++ b/databases/mariadb106-server/files/client.cnf.sample.in @@ -0,0 +1,52 @@ +# Options specific to client applications, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups + +# Options specific to all client programs +[client] +# port = 3306 # inherited from %%ETCDIR%%/my.cnf +# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf + +# Options specific to MariaDB client programs +[client-mariadb] + +# +## Options for specific client Tools +# + +# Options read by `mysql` +# Renamed from [mysql] starting with MariaDB 10.4.6. +[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6. +prompt = \u@\h [\d]>\_ +no_auto_rehash + +# Options read by `mysqldump` +# Renamed from [mysqldump] starting with MariaDB 10.4.6. +[mariadb-dump] +max_allowed_packet = 256M +quote_names +quick + +# Options read by `mysqladmin` +# Renamed from [mysqladmin] starting with MariaDB 10.4.6. +[mariadb-admin] + +# Options read by `mysqlbinlog` +# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. +[mariadb-binlog] + +# Options read by `mysqlcheck` +# Renamed from [mysqlcheck] starting with MariaDB 10.4.6. +[mariadb-check] + +# Options read by `mysqlimport` +# Renamed from [mysqlimport] starting with MariaDB 10.4.6. +[mariadb-import] + +# Options read by `mysqlshow` +# Renamed from [mysqlshow] starting with MariaDB 10.4.6. +[mariadb-show] + +# Options read by `mysqlslap` +# Renamed from [mysqlslap] starting with MariaDB 10.4.6. +[mariadb-slap] + diff --git a/databases/mariadb106-server/files/my.cnf.sample.in b/databases/mariadb106-server/files/my.cnf.sample.in new file mode 100644 index 000000000000..15dbc7e64da8 --- /dev/null +++ b/databases/mariadb106-server/files/my.cnf.sample.in @@ -0,0 +1,13 @@ +# +# This group is read both by the client and the server +# use it for options that affect everything, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups +# +[client-server] +port = 3306 +socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% + +# +# include *.cnf from the config directory +# +!includedir %%ETCDIR%%/conf.d/ diff --git a/databases/mariadb106-server/files/mysql-server.in b/databases/mariadb106-server/files/mysql-server.in new file mode 100644 index 000000000000..c4fd7307ca24 --- /dev/null +++ b/databases/mariadb106-server/files/mysql-server.in @@ -0,0 +1,149 @@ +#!/bin/sh + +# PROVIDE: mysql +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_(instance_)?enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. +# mysql_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%" +# Base database directory. +# mysql_(instance_)?args (str): Custom additional arguments to be passed +# to mysqld_safe (default empty). +# mysql_(instance_)?pidfile (str): Custum PID file path and name. +# Default to "${mysql_dbdir}/${hostname}.pid". +# mysql_(instance_)?user (str): User to run mysqld as +# Default to "%%MARIADB_USER%%" created by the port +# mysql_(instance_)?optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". +# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%" +# mysql_instances (str): Set to "" by default. +# If defined, list of instances to enable + +. /etc/rc.subr + +name="mysql" +rcvar=mysql_enable + +load_rc_config $name + +: ${mysql_enable="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} +: ${mysql_user="%%MARIADB_USER%%"} +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" +: ${mysql_dbdir="%%MARIADB_DBDIR%%"} +: ${mysql_optfile="%%ETCDIR%%/my.cnf"} +: ${mysql_rundir="%%MARIADB_RUNDIR%%"} + +command="/usr/sbin/daemon" +procname="%%PREFIX%%/libexec/mariadbd" +start_precmd="${name}_prestart" +start_postcmd="${name}_poststart" + +if [ -n "$2" ]; then + instance="$2" + load_rc_config ${name}_${instance} + case "$mysql_instances" in + "$2 "*|*" $2 "*|*" $2"|"$2") + eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" + eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}" + %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" + %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}" + eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}" + eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}" + ;; + *) + err 1 "$2 not found in mysql_instances" ;; + esac +else + if [ -n "${mysql_instances}" -a -n "$1" ]; then + for instance in ${mysql_instances}; do + eval _enable="\${mysql_${instance}_enable}" + case "${_enable:-${mysql_enable}}" in + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + continue + ;; + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + ;; + *) + if [ -z "$_enable" ]; then + _var=mysql_enable + else + _var=mysql_${instance}_enable + fi + warn "Bad value" \ + "'${_enable:-${mysql_enable}}'" \ + "for ${_var}. " \ + "Instance ${instance} skipped." + continue + ;; + esac + echo "===> mysql instance: ${instance}" + if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then + success="${instance} ${success}" + else + failed="${instance} (${retcode}) ${failed}" + fi + done + exit 0 + else + mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"} + fi +fi + +pidfile=$mysql_pidfile +mysql_install_db="%%PREFIX%%/bin/mariadb-install-db" +mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" +command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}" + +mysql_create_auth_tables() +{ + eval $mysql_install_db $mysql_install_db_args + [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} +} + +mysql_prestart() +{ + local dir + for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do + if [ -f "${dir}/my.cnf" ]; then + echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf" + return 1 + fi + done + if [ ! -d "${mysql_dbdir}/mysql/." ]; then + mysql_create_auth_tables || return 1 + fi + mysql_group="`/usr/bin/id -gn ${mysql_user}`" + [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`" + if [ ! -d "${mysql_rundir}" ]; then + install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" + fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 + if [ ! -d "${mysql_rundir}" ]; then + install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir} + fi +} + +mysql_poststart() +{ + local timeout=15 + while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do + timeout=$(( timeout - 1 )) + sleep 1 + done + return 0 +} + +run_rc_command "$1" diff --git a/databases/mariadb106-server/files/patch-include_m__ctype.h b/databases/mariadb106-server/files/patch-include_m__ctype.h new file mode 100644 index 000000000000..8e323646752e --- /dev/null +++ b/databases/mariadb106-server/files/patch-include_m__ctype.h @@ -0,0 +1,13 @@ +--- include/m_ctype.h.orig 2021-08-04 18:00:35 UTC ++++ include/m_ctype.h +@@ -43,6 +43,10 @@ extern "C" { + + #define CHARSET_DIR "charsets/" + ++#ifndef ulong ++typedef unsigned long ulong; ++#endif ++ + #define my_wc_t ulong + + #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD diff --git a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc new file mode 100644 index 000000000000..445fd0e97865 --- /dev/null +++ b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc @@ -0,0 +1,24 @@ +--- mysys/crc32/crc32c.cc.orig 2021-08-04 18:00:35 UTC ++++ mysys/crc32/crc32c.cc +@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) { + + return arch_ppc_crc32; + } ++#elif __FreeBSD__ ++#include <machine/cpu.h> ++#include <sys/auxv.h> ++#include <sys/elf_common.h> ++static int arch_ppc_probe(void) { ++ unsigned long cpufeatures; ++ arch_ppc_crc32 = 0; ++ ++#if defined(__powerpc64__) ++ elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)); ++ if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1; ++#endif /* __powerpc64__ */ ++ ++ return arch_ppc_crc32; ++} + #endif // __linux__ + #endif + diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh new file mode 100644 index 000000000000..334353a99b4c --- /dev/null +++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh @@ -0,0 +1,10 @@ +--- scripts/mysql_config.sh.orig 2021-07-07 20:25:20 UTC ++++ scripts/mysql_config.sh +@@ -88,6 +88,7 @@ fi + # Create options + libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" + embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" ++embedded_libs="$embedded_libs -L/usr/local/lib " + + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp new file mode 100644 index 000000000000..da71156da758 --- /dev/null +++ b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp @@ -0,0 +1,24 @@ +--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2021-08-04 18:07:21 UTC ++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp +@@ -22,13 +22,21 @@ namespace utils + { + void setThreadName(const char *threadName) + { ++#ifdef __FreeBSD__ ++ pthread_set_name_np(pthread_self(), threadName); ++#else + prctl(PR_SET_NAME, threadName, 0, 0, 0); ++#endif + } + + std::string getThreadName() + { + char buf[32]; ++#ifdef __FreeBSD__ ++ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); ++#else + prctl(PR_GET_NAME, buf, 0, 0, 0); ++#endif + return std::string(buf); + } + } // end of namespace diff --git a/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h new file mode 100644 index 000000000000..dab7177b65b8 --- /dev/null +++ b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h @@ -0,0 +1,13 @@ +--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2020-06-23 15:10:17 UTC ++++ storage/rocksdb/rocksdb/port/jemalloc_helper.h +@@ -26,6 +26,10 @@ + #include <jemalloc/jemalloc.h> + #endif + ++#ifdef __FreeBSD__ ++#define JEMALLOC_USABLE_SIZE_CONST const ++#endif ++ + #ifndef JEMALLOC_CXX_THROW + #define JEMALLOC_CXX_THROW + #endif diff --git a/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt new file mode 100644 index 000000000000..5ab7d5de3dd2 --- /dev/null +++ b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt @@ -0,0 +1,8 @@ +--- tpool/CMakeLists.txt.orig 2020-06-23 15:10:18 UTC ++++ tpool/CMakeLists.txt +@@ -1,4 +1,5 @@ + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include) ++ADD_DEFINITIONS(-fPIC) + IF(WIN32) + SET(EXTRA_SOURCES tpool_win.cc aio_win.cc) + ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in new file mode 100644 index 000000000000..189a27624f5d --- /dev/null +++ b/databases/mariadb106-server/files/pkg-message.in @@ -0,0 +1,24 @@ +[ +{ type: install + message: <<EOM +MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for +my.cnf. Please move existing my.cnf files from those paths to +%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample +configuration files are provided in %%PREFIX%%/etc/mysql +and %%PREFIX%%/etc/mysql/conf.d. +The rc(8) script no longer uses /var/db/mysql/my.cnf for configuration +nor /var/db/mysql for logs and PID-file. + +This port does NOT include the mytop perl script, this is included in +the MariaDB tarball but the most recent version can be found in the +databases/mytop port +EOM +} +{ type: upgrade + message: <<EOM +Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag) +the first time you start the MySQL server after an upgrade from an +earlier version. +EOM +} + diff --git a/databases/mariadb106-server/files/server.cnf.sample.in b/databases/mariadb106-server/files/server.cnf.sample.in new file mode 100644 index 000000000000..9e84965c7679 --- /dev/null +++ b/databases/mariadb106-server/files/server.cnf.sample.in @@ -0,0 +1,60 @@ +# Options specific to server applications, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups + +# Options specific to all server programs +[server] + +# Options specific to MariaDB server programs +[server-mariadb] + +# +# Options for specific server tools +# + +[mysqld] +user = %%MARIADB_USER%% +# port = 3306 # inherited from %%ETCDIR%%/my.cnf +# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf +bind-address = 127.0.0.1 +basedir = %%PREFIX%% +datadir = %%MARIADB_DBDIR%% +net_retry_count = 16384 +log_error = %%MARIADB_LOGDIR%%/mysqld.err +# [mysqld] configuration for ZFS +# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar +# Create separate datasets for data and logs, eg +# zroot/mysql compression=on recordsize=128k atime=off +# zroot/mysql/data recordsize=16k +# zroot/mysql/logs +# datadir = %%MARIADB_DBDIR%%/data +# innodb_log_group_home_dir = %%MARIADB_DBDIR%%/log +# audit_log_file = %%MARIADB_DBDIR%%/log/audit.log +# general_log_file = %%MARIADB_DBDIR%%/log/general.log +# log_bin = %%MARIADB_DBDIR%%/log/mysql-bin +# relay_log = %%MARIADB_DBDIR%%/log/relay-log +# slow_query_log_file = %%MARIADB_DBDIR%%/log/slow.log +# innodb_doublewrite = 0 +# innodb_flush_method = O_DSYNC + +# Options read by `mariadb_safe` +# Renamed from [mysqld_safe] starting with MariaDB 10.4.6. +[mariadb-safe] + +# Options read my `mariabackup` +[mariabackup] + +# Options read by `mysql_upgrade` +# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6. +[mariadb-upgrade] + +# Specific options read by the mariabackup SST method +[sst] + +# Options read by `mysqlbinlog` +# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. +[mariadb-binlog] + +# Options read by `mysqladmin` +# Renamed from [mysqladmin] starting with MariaDB 10.4.6. +[mariadb-admin] + |