Index: head/databases/mariadb104-server/Makefile =================================================================== --- head/databases/mariadb104-server/Makefile (revision 542084) +++ head/databases/mariadb104-server/Makefile (revision 542085) @@ -1,265 +1,269 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb PORTVERSION= 10.4.13 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 104-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql ETCDIR= ${PREFIX}/etc/mysql MARIADB_USER?= mysql MARIADB_GROUP?= mysql MARIADB_RUNDIR?= /var/run/mysql +MARIADB_SOCK?= mysql.sock MARIADB_LOGDIR?= /var/log/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ -DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \ - -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}" \ + -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \ - MARIADB_RUNDIR="${MARIADB_RUNDIR}" + MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ + MARIADB_SOCK="${MARIADB_SOCK}" PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \ MARIADB_GROUP="${MARIADB_GROUP}" .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql SUB_FILES+= my.cnf.sample client.cnf.sample PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:104m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server +USERS= ${MARIADB_USER} +GROUPS= ${MARIADB_GROUP} CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT SUB_FILES+= server.cnf.sample SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 WSREP_RUN_DEPENDS= bash:shells/bash \ rsync:net/rsync \ #stunnel:security/stunnel WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .endif # ${PKGNAMESUFFIX:M*-client} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include .if ${ARCH} != amd64 PLIST_SUB+= WSREP="@comment " .endif .if ${OPSYS} == DragonFly CMAKE_OFF+= WITH_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c pre-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d .if ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample ${RM} -r ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/include/mysql/server ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR} post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .else # ! ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server/private \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} post-install-WSREP-on: ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include Index: head/databases/mariadb104-server/files/my.cnf.sample.in =================================================================== --- head/databases/mariadb104-server/files/my.cnf.sample.in (revision 542084) +++ head/databases/mariadb104-server/files/my.cnf.sample.in (revision 542085) @@ -1,13 +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%%/mysql.sock +socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # # include *.cnf from the config directory # !includedir %%ETCDIR%%/conf.d/ Index: head/databases/mariadb104-server/files/mysql-server.in =================================================================== --- head/databases/mariadb104-server/files/mysql-server.in (revision 542084) +++ head/databases/mariadb104-server/files/mysql-server.in (revision 542085) @@ -1,140 +1,149 @@ #!/bin/sh # $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $ # # 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 "/var/db/mysql" -# Base database directory. +# mysql_(instance_)?dbdir (str): Base database directory. +# Default to "/var/db/mysql" # 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 "mysql" created by the port +# mysql_(instance_)?user (str): User to run mysqld as. +# Default to "%%MARIADB_USER%%" created by the port +# mysql_(instance_)?socket (str): Name of the socket file. +# Default to "" and used from %%ETCDIR%%/my.cnf, +# where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%". # mysql_(instance_)?optfile (str): Server-specific option file. # Default to "${mysql_dbdir}/my.cnf". # 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="mysql"} +: ${mysql_user="%%MARIADB_USER%%"} %%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} command="/usr/sbin/daemon" procname="%%PREFIX%%/libexec/mysqld" 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:-\"/var/db/mysql_${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:-\"${mysql_socket}\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.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:-"${mysql_dbdir}/`/bin/hostname`.pid"} fi fi pidfile=$mysql_pidfile mysql_install_db="%%PREFIX%%/bin/mysql_install_db" mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +command_args="-c -f %%PREFIX%%/bin/mysqld_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 /etc/mysql; do if [ -f "${dir}/my.cnf" ]; then echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}" return 1 fi done if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 + fi + [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`" + if [ ! -d "${mysql_rundir}" ]; then + install -d -o ${mysql_user} -g %%MARIADB_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 } 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" Index: head/databases/mariadb104-server/files/server.cnf.sample.in =================================================================== --- head/databases/mariadb104-server/files/server.cnf.sample.in (revision 542084) +++ head/databases/mariadb104-server/files/server.cnf.sample.in (revision 542085) @@ -1,60 +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 +# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf bind-address = 127.0.0.1 basedir = %%PREFIX%% datadir = /var/db/mysql net_retry_count = 16384 -log_error = %%MARIADB_LOGDIR%%/${hostname}.err +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 = /var/db/mysql/data # innodb_log_group_home_dir = /var/db/mysql/log # audit_log_file = /var/db/mysql/log/audit.log # general_log_file = /var/db/mysql/log/general.log # log_bin = /var/db/mysql/log/mysql-bin # relay_log = /var/db/mysql/log/relay-log # slow_query_log_file = /var/db/mysql/log/slow.log # innodb_doublewrite = 0 # innodb_flush_method = O_DSYNC # Options read by `mysqld_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]