From 7c628580a6ecaad9b044191dc24661fc291fb42e Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Mon, 12 Oct 2020 10:50:51 +0200 Subject: [PATCH] mariadb: Use defaults and change default datadir Use /srv/mysql as default datadir as /var/lib/mysql is in tmpfs. This doesn't affect any existing setup as up till now it had to be always specified in configuration. That is addressed in the second part of this commit - init script now uses even defaults as compiled in MariaDB so not everything has to be specified in configuration file. Signed-off-by: Michal Hrusecky --- utils/mariadb/Makefile | 2 +- utils/mariadb/files/mysqld.init | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 321ee70a9b..162b0860a5 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -380,7 +380,7 @@ CMAKE_OPTIONS += \ -DINSTALL_SQLBENCHDIR="" \ -DINSTALL_SUPPORTFILESDIR=share/mariadb \ -DINSTALL_UNIX_ADDRDIR=$(MARIADB_SOCKET) \ - -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_DATADIR=/srv/mysql \ -DMYSQL_UNIX_ADDR=$(MARIADB_SOCKET) \ -DSKIP_TESTS=ON \ -DWITH_DEBUG=OFF \ diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init index 3e35389073..4f23a01de5 100644 --- a/utils/mariadb/files/mysqld.init +++ b/utils/mariadb/files/mysqld.init @@ -22,11 +22,7 @@ export HOME="/etc/mysql" cd / mysqld_get_param() { - $MYSQLD --print-defaults \ - | tr " " "\n" \ - | grep -- "--$1" \ - | tail -n 1 \ - | cut -d= -f2 + /usr/bin/mysqld --help --verbose | sed -n 's|^'"$1"'[[:blank:]]\+||p' } # Checks if a server is running and accessible. -- 2.30.2