Browse Source

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 <michal.hrusecky@turris.com>
lilik-openwrt-22.03
Michal Hrusecky 4 years ago
parent
commit
7c628580a6
No known key found for this signature in database GPG Key ID: 7B7562FE6F4D91EF
2 changed files with 2 additions and 6 deletions
  1. +1
    -1
      utils/mariadb/Makefile
  2. +1
    -5
      utils/mariadb/files/mysqld.init

+ 1
- 1
utils/mariadb/Makefile View File

@ -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 \


+ 1
- 5
utils/mariadb/files/mysqld.init View File

@ -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.


Loading…
Cancel
Save