forked from pool/mariadb
Adam Majer
e4b2876888
- update to 10.2.12 GA * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-10212-release-notes/ https://mariadb.com/kb/en/library/mariadb-10212-changelog/ - remove mysql-community-server-5.5.6-safe-process-in-bin.patch becuase this moving is done in the specfile - get rid of the archive with patches (remove mysql-patches.tar.xz and series files), handle patches in the standard way - add comments to the section with removing unused files (based on https://lists.launchpad.net/maria-developers/msg11028.html) - put rm statements together - install the new upstream systemd-tmpfiles configuration file 'tmpfiles.conf' and rename it to 'mariadb.conf' in order to follow the manual - remove the new upstream systemd-sysusers configuration file as we handle creating of mysql user in the specfile - mysql.service: remove calling of the wait function and let systemd to do this job. Switch from 'Type=simple' to 'Type=notify' and add TimeoutSec=300 - rename unit files from mysql to mariadb and add mysql alias for the backward compatibility [bsc#1067443] * mysql.service -> mariadb.service * mysql.target -> mariadb.target * mysql@.service -> mariadb@.service - remove configuration-tweaks.tar.xz and move configuration to my.ini/my.cnf file (omit default_plugins.cnf as all configuration here was commented out) - add a numeric prefix for galera.cnf file in order to allow users to speficy in which order the configs will be loaded within the my.cnf.d directory [bsc#1055268] OBS-URL: https://build.opensuse.org/request/show/563119 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=203
97 lines
2.4 KiB
Diff
97 lines
2.4 KiB
Diff
PATCH-P0-FIX-SUSE: Tweak default configuration
|
|
|
|
This patch adds log file locations and socket location as they should be in
|
|
SuSE to the default configuration files.
|
|
|
|
Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org>
|
|
|
|
Index: support-files/my-huge.cnf.sh
|
|
===================================================================
|
|
--- support-files/my-huge.cnf.sh.orig
|
|
+++ support-files/my-huge.cnf.sh
|
|
@@ -131,7 +131,15 @@ server-id = 1
|
|
#innodb_flush_log_at_trx_commit = 1
|
|
#innodb_lock_wait_timeout = 50
|
|
|
|
+# The safe_mysqld script
|
|
+[safe_mysqld]
|
|
+log-error=/var/log/mysql/mysqld.log
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
+
|
|
+!includedir /etc/mysql
|
|
+
|
|
[mysqldump]
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
quick
|
|
max_allowed_packet = 16M
|
|
|
|
Index: support-files/my-large.cnf.sh
|
|
===================================================================
|
|
--- support-files/my-large.cnf.sh.orig
|
|
+++ support-files/my-large.cnf.sh
|
|
@@ -131,7 +131,15 @@ server-id = 1
|
|
#innodb_flush_log_at_trx_commit = 1
|
|
#innodb_lock_wait_timeout = 50
|
|
|
|
+# The safe_mysqld script
|
|
+[safe_mysqld]
|
|
+log-error=/var/log/mysql/mysqld.log
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
+
|
|
+!includedir /etc/mysql
|
|
+
|
|
[mysqldump]
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
quick
|
|
max_allowed_packet = 16M
|
|
|
|
Index: support-files/my-medium.cnf.sh
|
|
===================================================================
|
|
--- support-files/my-medium.cnf.sh.orig
|
|
+++ support-files/my-medium.cnf.sh
|
|
@@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@
|
|
[mysqld]
|
|
port = @MYSQL_TCP_PORT@
|
|
socket = @MYSQL_UNIX_ADDR@
|
|
+# Change following line if you want to store your database elsewhere
|
|
+datadir = /var/lib/mysql
|
|
skip-external-locking
|
|
key_buffer_size = 16M
|
|
max_allowed_packet = 1M
|
|
@@ -129,7 +131,15 @@ server-id = 1
|
|
#innodb_flush_log_at_trx_commit = 1
|
|
#innodb_lock_wait_timeout = 50
|
|
|
|
+# The safe_mysqld script
|
|
+[safe_mysqld]
|
|
+log-error = /var/log/mysql/mysqld.log
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
+
|
|
+!includedir /etc/mysql
|
|
+
|
|
[mysqldump]
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
quick
|
|
max_allowed_packet = 16M
|
|
|
|
Index: support-files/my-small.cnf.sh
|
|
===================================================================
|
|
--- support-files/my-small.cnf.sh.orig
|
|
+++ support-files/my-small.cnf.sh
|
|
@@ -65,7 +65,15 @@ server-id = 1
|
|
#innodb_flush_log_at_trx_commit = 1
|
|
#innodb_lock_wait_timeout = 50
|
|
|
|
+# The safe_mysqld script
|
|
+[safe_mysqld]
|
|
+log-error = /var/log/mysql/mysqld.log
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
+
|
|
+!includedir /etc/mysql
|
|
+
|
|
[mysqldump]
|
|
+socket = @MYSQL_UNIX_ADDR@
|
|
quick
|
|
max_allowed_packet = 16M
|
|
|