Index: head/databases/mariadb104-client/Makefile =================================================================== --- head/databases/mariadb104-client/Makefile (revision 540632) +++ head/databases/mariadb104-client/Makefile (revision 540633) @@ -1,17 +1,15 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 104-client COMMENT= Multithreaded SQL database (client) -BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' - MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= databases/mytop .include "${MASTERDIR}/Makefile" Index: head/databases/mariadb104-client/pkg-plist =================================================================== --- head/databases/mariadb104-client/pkg-plist (revision 540632) +++ head/databases/mariadb104-client/pkg-plist (revision 540633) @@ -1,171 +1,172 @@ bin/mariadb bin/mariadb-access bin/mariadb-admin bin/mariadb-binlog bin/mariadb-check bin/mariadb-convert-table-format bin/mariadb-dump bin/mariadb-find-rows bin/mariadb-hotcopy bin/mariadb-import bin/mariadb-plugin bin/mariadb-setpermission bin/mariadb-show bin/mariadb-slap @comment bin/mariadb-test @comment bin/mariadb-waitpid bin/mariadb_config bin/msql2mysql bin/mysql bin/mysql_config bin/mysql_convert_table_format bin/mysql_find_rows bin/mysql_setpermission @comment bin/mysql_plugin @comment bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap @comment bin/mysqltest bin/mytop bin/replace @comment bin/wsrep_sst_rsync_wan @sample %%ETCDIR%%/my.cnf.sample @sample %%ETCDIR%%/conf.d/client.cnf.sample include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h include/mysql/ma_tls.h include/mysql/mariadb/ma_io.h include/mysql/mariadb_com.h include/mysql/mariadb_ctype.h include/mysql/mariadb_dyncol.h include/mysql/mariadb_rpl.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_version.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so @comment lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so libdata/pkgconfig/libmariadb.pc @comment man/man1/aria_chk.1.gz @comment man/man1/aria_dump_log.1.gz @comment man/man1/aria_ftdump.1.gz @comment man/man1/aria_pack.1.gz @comment man/man1/aria_read_log.1.gz @comment man/man1/galera_new_cluster.1.gz @comment man/man1/galera_recovery.1.gz @comment man/man1/innochecksum.1.gz @comment man/man1/mariabackup.1.gz man/man1/mariadb.1.gz man/man1/mariadb-access.1.gz man/man1/mariadb-admin.1.gz @comment man/man1/mariadb-backup.1.gz man/man1/mariadb-binlog.1.gz man/man1/mariadb-check.1.gz @comment man/man1/mariadb-client-test-embedded.1.gz @comment man/man1/mariadb-client-test.1.gz man/man1/mariadb-convert-table-format.1.gz man/man1/mariadb-dump.1.gz @comment man/man1/mariadb-dumpslow.1.gz @comment man/man1/mariadb-embedded.1.gz man/man1/mariadb-find-rows.1.gz @comment man/man1/mariadb-fix-extensions.1.gz man/man1/mariadb-hotcopy.1.gz man/man1/mariadb-import.1.gz @comment man/man1/mariadb-install-db.1.gz @comment man/man1/mariadb-ldb.1.gz man/man1/mariadb-plugin.1.gz @comment man/man1/mariadb-secure-installation.1.gz @comment man/man1/mariadb-service-convert.1.gz man/man1/mariadb-setpermission.1.gz man/man1/mariadb-show.1.gz man/man1/mariadb-slap.1.gz @comment man/man1/mariadb-test-embedded.1.gz @comment man/man1/mariadb-test.1.gz @comment man/man1/mariadb-tzinfo-to-sql.1.gz @comment man/man1/mariadb-upgrade.1.gz @comment man/man1/mariadb-waitpid.1.gz @comment man/man1/mariadbd-multi.1.gz @comment man/man1/mariadbd-safe-helper.1.gz @comment man/man1/mariadbd-safe.1.gz @comment man/man8/mariadbd.8.gz man/man1/msql2mysql.1.gz @comment man/man1/mbstream.1.gz @comment man/man1/my_print_defaults.1.gz man/man1/my_safe_process.1.gz @comment man/man1/myisam_ftdump.1.gz @comment man/man1/myisamchk.1.gz @comment man/man1/myisamlog.1.gz @comment man/man1/myisampack.1.gz man/man1/mysql-stress-test.pl.1.gz man/man1/mysql-test-run.pl.1.gz man/man1/mysql.1.gz @comment man/man1/mysql.server.1.gz @comment man/man1/mysql_client_test.1.gz @comment man/man1/mysql_client_test_embedded.1.gz man/man1/mysql_config.1.gz man/man1/mysql_convert_table_format.1.gz @comment man/man1/mysql_embedded.1.gz man/man1/mysql_find_rows.1.gz @comment man/man1/mysql_fix_extensions.1.gz @comment man/man1/mysql_install_db.1.gz @comment man/man1/mysql_ldb.1.gz man/man1/mysql_plugin.1.gz @comment man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz @comment man/man1/mysql_upgrade.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqlaccess.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz @comment man/man1/mysqld_multi.1.gz @comment man/man1/mysqld_safe.1.gz @comment man/man1/mysqld_safe_helper.1.gz man/man1/mysqldump.1.gz @comment man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz @comment man/man1/mysqltest.1.gz @comment man/man1/mysqltest_embedded.1.gz @comment man/man1/perror.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz @comment man/man1/wsrep_sst_common.1.gz @comment man/man1/wsrep_sst_mariabackup.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz @comment man/man1/wsrep_sst_rsync_wan.1.gz @comment man/man8/mysqld.8.gz libdata/pkgconfig/mariadb.pc +@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%% Index: head/databases/mariadb104-server/Makefile =================================================================== --- head/databases/mariadb104-server/Makefile (revision 540632) +++ head/databases/mariadb104-server/Makefile (revision 540633) @@ -1,249 +1,265 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb PORTVERSION= 10.4.13 -PORTREVISION?= 2 +PORTREVISION?= 3 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 -SLAVEDIRS= databases/mariadb102-client 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_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}" \ -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} \ - -DPLUGIN_AUTH_TEST_PLUGIN=NO + -DCMAKE_PREFIX_PATH=${PREFIX} CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS -DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ - EXAMPLE_KEY_MANAGEMENT FTEXAMPLE +DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ + EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql -CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ +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}" +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= mysql -GROUPS= mysql 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 -.include - .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 -.endif # ${PKGNAMESUFFIX:M*-client} - -.if defined(WITH_OPENSSL_PORT) +.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} -p ${STAGEDIR}${ETCDIR}/conf.d + ${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} - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server + ${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 - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${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/client.cnf.sample.in =================================================================== --- head/databases/mariadb104-server/files/client.cnf.sample.in (revision 540632) +++ head/databases/mariadb104-server/files/client.cnf.sample.in (revision 540633) @@ -1,52 +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 # set in %%ETCDIR%%/my.cnf -# socket = /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf +# port = 3306 # inherited from %%ETCDIR%%/my.cnf +# socket = %%MARIADB_RUNDIR%%/mysql.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] Index: head/databases/mariadb104-server/files/my.cnf.sample.in =================================================================== --- head/databases/mariadb104-server/files/my.cnf.sample.in (revision 540632) +++ head/databases/mariadb104-server/files/my.cnf.sample.in (revision 540633) @@ -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 = /var/run/mysql/mysql.sock +socket = %%MARIADB_RUNDIR%%/mysql.sock # # include *.cnf from the config directory # !includedir %%ETCDIR%%/conf.d/ Index: head/databases/mariadb104-server/files/pkg-message.in =================================================================== --- head/databases/mariadb104-server/files/pkg-message.in (revision 540632) +++ head/databases/mariadb104-server/files/pkg-message.in (revision 540633) @@ -1,22 +1,26 @@ [ { type: install message: < flag) the first time you start the MySQL server after an upgrade from an earlier version. EOM } Index: head/databases/mariadb104-server/files/server.cnf.sample.in =================================================================== --- head/databases/mariadb104-server/files/server.cnf.sample.in (revision 540632) +++ head/databases/mariadb104-server/files/server.cnf.sample.in (revision 540633) @@ -1,59 +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 = mysql -# port = 3306 # set in %%ETCDIR%%/my.cnf -# socket = /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf +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 = /var/db/mysql net_retry_count = 16384 +log_error = %%MARIADB_LOGDIR%%/${hostname}.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] Index: head/databases/mariadb104-server/pkg-plist =================================================================== --- head/databases/mariadb104-server/pkg-plist (revision 540632) +++ head/databases/mariadb104-server/pkg-plist (revision 540633) @@ -1,443 +1,443 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log %%INNOBASE%%bin/innochecksum %%INNOBASE%%bin/mariabackup bin/mariadb-backup bin/mariadb-dumpslow bin/mariadb-embedded bin/mariadb-fix-extensions bin/mariadb-install-db %%ROCKSDB%%bin/mariadb-ldb bin/mariadb-secure-installation bin/mariadb-tzinfo-to-sql bin/mariadb-upgrade bin/mariadbd-multi bin/mariadbd-safe bin/mariadbd-safe-helper bin/mariadb-waitpid %%INNOBASE%%bin/mbstream bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb bin/mysql_plugin bin/mysql_secure_installation bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_waitpid bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow @comment bin/mysqltest_embedded bin/perror bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump @comment bin/test-connect-t %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan @sample %%ETCDIR%%/conf.d/server.cnf.sample %%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample @sample %%ETCDIR%%/user_map.conf.sample @comment data/test/db.opt include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h include/mysql/server/byte_order_generic_x86.h include/mysql/server/byte_order_generic_x86_64.h include/mysql/server/decimal.h include/mysql/server/errmsg.h include/mysql/server/handler_ername.h include/mysql/server/handler_state.h include/mysql/server/json_lib.h include/mysql/server/keycache.h include/mysql/server/little_endian.h include/mysql/server/m_ctype.h include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/my_alloc.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h include/mysql/server/my_decimal_limits.h include/mysql/server/my_dir.h include/mysql/server/my_getopt.h include/mysql/server/my_global.h include/mysql/server/my_list.h include/mysql/server/my_net.h include/mysql/server/my_pthread.h include/mysql/server/my_sys.h include/mysql/server/my_valgrind.h include/mysql/server/my_xml.h include/mysql/server/mysql.h include/mysql/server/mysql/auth_dialog_client.h include/mysql/server/mysql/client_plugin.h include/mysql/server/mysql/plugin.h include/mysql/server/mysql/plugin_audit.h include/mysql/server/mysql/plugin_auth.h include/mysql/server/mysql/plugin_auth_common.h include/mysql/server/mysql/plugin_encryption.h include/mysql/server/mysql/plugin_ftparser.h include/mysql/server/mysql/plugin_password_validation.h include/mysql/server/mysql/psi/mysql_file.h include/mysql/server/mysql/psi/mysql_idle.h include/mysql/server/mysql/psi/mysql_socket.h include/mysql/server/mysql/psi/mysql_stage.h include/mysql/server/mysql/psi/mysql_statement.h include/mysql/server/mysql/psi/mysql_table.h include/mysql/server/mysql/psi/mysql_thread.h include/mysql/server/mysql/psi/psi.h include/mysql/server/mysql/psi/psi_abi_v0.h include/mysql/server/mysql/psi/psi_abi_v1.h include/mysql/server/mysql/psi/psi_abi_v2.h include/mysql/server/mysql/psi/psi_base.h include/mysql/server/mysql/psi/psi_memory.h include/mysql/server/mysql/service_base64.h include/mysql/server/mysql/service_debug_sync.h include/mysql/server/mysql/service_encryption.h include/mysql/server/mysql/service_encryption_scheme.h include/mysql/server/mysql/service_json.h include/mysql/server/mysql/service_kill_statement.h include/mysql/server/mysql/service_logger.h include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h include/mysql/server/mysql/service_my_print_error.h include/mysql/server/mysql/service_my_snprintf.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h include/mysql/server/mysql/service_thd_alloc.h include/mysql/server/mysql/service_thd_autoinc.h include/mysql/server/mysql/service_thd_error_context.h include/mysql/server/mysql/service_thd_rnd.h include/mysql/server/mysql/service_thd_specifics.h include/mysql/server/mysql/service_thd_timezone.h include/mysql/server/mysql/service_thd_wait.h include/mysql/server/mysql/service_wsrep.h include/mysql/server/mysql/services.h include/mysql/server/mysql_com.h include/mysql/server/mysql_com_server.h include/mysql/server/mysql_embed.h include/mysql/server/mysql_time.h include/mysql/server/mysql_version.h include/mysql/server/mysqld_ername.h include/mysql/server/mysqld_error.h include/mysql/server/pack.h include/mysql/server/sql_common.h include/mysql/server/sql_state.h include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h @comment lib/mysql/libmariadbclient.a lib/mysql/libmariadbd.a lib/mysql/libmariadbd.so lib/mysql/libmariadbd.so.19 lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool lib/mysql/plugin/auth_pam_v1.so lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/debug_key_management.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/pam_user_map.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/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/test_versioning.so %%WSREP%%lib/mysql/plugin/wsrep_info.so libexec/mariadbd libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz man/man1/mariabackup.1.gz man/man1/mariadb-backup.1.gz man/man1/mariadb-dumpslow.1.gz man/man1/mariadb-embedded.1.gz man/man1/mariadb-fix-extensions.1.gz man/man1/mariadb-install-db.1.gz %%ROCKSDB%%man/man1/mariadb-ldb.1.gz man/man1/mariadb-secure-installation.1.gz @comment man/man1/mariadb-service-convert.1.gz man/man1/mariadb-tzinfo-to-sql.1.gz man/man1/mariadb-upgrade.1.gz man/man1/mariadbd-multi.1.gz man/man1/mariadbd-safe-helper.1.gz man/man1/mariadbd-safe.1.gz man/man1/mbstream.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_fix_extensions.1.gz %%ROCKSDB%%man/man1/mysql_ldb.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz man/man1/perror.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz %%TOKUDB%%man/man1/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz %%WSREP%%man/man1/wsrep_sst_common.1.gz %%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz man/man8/mariadbd.8.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%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%%/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%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.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 %%WSREP%%%%DATADIR%%/wsrep_notify @comment %%DOCSDIR%%/COPYING %%DOCSDIR%%/INSTALL-BINARY %%WSREP%%%%DOCSDIR%%/README-wsrep @comment %%DOCSDIR%%/THIRDPARTY @comment share/groonga-normalizer-mysql/lgpl-2.0.txt @comment share/groonga/COPYING @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md @comment bin/mariadb @comment bin/mariadb-access @comment bin/mariadb-admin @comment bin/mariadb-binlog @comment bin/mariadb-check @comment bin/mariadb-client-test @comment bin/mariadb-client-test-embedded @comment bin/mariadb-convert-table-format @comment bin/mariadb-dump @comment bin/mariadb-find-rows @comment bin/mariadb-hotcopy @comment bin/mariadb-import @comment bin/mariadb-plugin @comment bin/mariadb-setpermission @comment bin/mariadb-show @comment bin/mariadb-slap @comment bin/mariadb-test @comment bin/mariadb-test-embedded @comment bin/mariadb_config @comment bin/msql2mysql @comment bin/mysql @comment bin/mysql_config @comment bin/mysql_convert_table_format @comment bin/mysql_find_rows @comment bin/mysql_setpermission @comment bin/mysqlaccess @comment bin/mysqladmin @comment bin/mysqlbinlog @comment bin/mysqlcheck @comment bin/mysqldump @comment bin/mysqlhotcopy @comment bin/mysqlimport @comment bin/mysqlshow @comment bin/mysqlslap @comment bin/mysqltest @comment bin/mytop @comment bin/replace @comment include/mysql/errmsg.h @comment include/mysql/ma_list.h @comment include/mysql/ma_pvio.h @comment include/mysql/ma_tls.h @comment include/mysql/mariadb/ma_io.h @comment include/mysql/mariadb_com.h @comment include/mysql/mariadb_ctype.h @comment include/mysql/mariadb_dyncol.h @comment include/mysql/mariadb_rpl.h @comment include/mysql/mariadb_stmt.h @comment include/mysql/mariadb_version.h @comment include/mysql/my_config.h @comment include/mysql/my_global.h @comment include/mysql/my_sys.h @comment include/mysql/mysql.h @comment include/mysql/mysql/client_plugin.h @comment include/mysql/mysql/plugin_auth.h @comment include/mysql/mysql/plugin_auth_common.h @comment include/mysql/mysql_com.h @comment include/mysql/mysql_version.h @comment include/mysql/mysqld_error.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/libmariadbclient.a @comment lib/mysql/libmysqlclient.a @comment lib/mysql/libmysqlclient.so @comment lib/mysql/libmysqlclient_r.a @comment lib/mysql/libmysqlclient_r.so @comment lib/mysql/plugin/auth_gssapi_client.so @comment lib/mysql/plugin/client_ed25519.so @comment lib/mysql/plugin/daemon_example.ini @comment lib/mysql/plugin/dialog.so @comment lib/mysql/plugin/mysql_clear_password.so @comment lib/mysql/plugin/sha256_password.so @comment libdata/pkgconfig/libmariadb.pc @comment man/man1/mariadb-access.1.gz @comment man/man1/mariadb-admin.1.gz @comment man/man1/mariadb-binlog.1.gz @comment man/man1/mariadb-check.1.gz @comment man/man1/mariadb-client-test-embedded.1.gz @comment man/man1/mariadb-client-test.1.gz @comment man/man1/mariadb-convert-table-format.1.gz @comment man/man1/mariadb-dump.1.gz @comment man/man1/mariadb-find-rows.1.gz @comment man/man1/mariadb-hotcopy.1.gz @comment man/man1/mariadb-import.1.gz @comment man/man1/mariadb-plugin.1.gz @comment man/man1/mariadb-service-convert.1.gz @comment man/man1/mariadb-setpermission.1.gz @comment man/man1/mariadb-show.1.gz @comment man/man1/mariadb-slap.1.gz @comment man/man1/mariadb-test-embedded.1.gz @comment man/man1/mariadb-test.1.gz man/man1/mariadb-waitpid.1.gz @comment man/man1/mariadb.1.gz @comment man/man1/msql2mysql.1.gz @comment man/man1/my_safe_process.1.gz @comment man/man1/mysql-stress-test.pl.1.gz @comment man/man1/mysql-test-run.pl.1.gz @comment man/man1/mysql.1.gz @comment man/man1/mysql_client_test.1.gz @comment man/man1/mysql_client_test_embedded.1.gz @comment man/man1/mysql_config.1.gz @comment man/man1/mysql_convert_table_format.1.gz @comment man/man1/mysql_embedded.1.gz @comment man/man1/mysql_find_rows.1.gz @comment man/man1/mysql_plugin.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_waitpid.1.gz @comment man/man1/mysqlaccess.1.gz @comment man/man1/mysqladmin.1.gz @comment man/man1/mysqlbinlog.1.gz @comment man/man1/mysqlcheck.1.gz @comment man/man1/mysqldump.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqlimport.1.gz @comment man/man1/mysqlshow.1.gz @comment man/man1/mysqlslap.1.gz @comment man/man1/mysqltest.1.gz @comment man/man1/mysqltest_embedded.1.gz @comment man/man1/replace.1.gz @comment share/pkgconfig/mariadb.pc - +@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%