-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEV-19933: Sync mariadb-common and update-alternatives based /etc/my…
…sql/ Split the big my.cnf into multiple smaller files with the same filenames and contents as official Debian/Ubuntu packaging has. The config contents stays the same apart from following additions which the original MariaDB upstream configs had and probably needs to be kept: - lc-messages=en_US and skip-external-locking in server config Configs the original MariaDB upstream had that are seemingly unnecessary and thus removed: - port=3306 removed from the client config - log_warnings=2 removed from server config Also adopt update-alternatives system using mysql-common/configure-symlinks. This way it is aligned with downstream Debian/Ubuntu packaging.
- Loading branch information
Showing
14 changed files
with
300 additions
and
216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,23 @@ | ||
# MariaDB-specific config file. | ||
# Read by /etc/mysql/my.cnf | ||
|
||
[client] | ||
# Default is Latin1, if you need UTF-8 set this (also in server section) | ||
#default-character-set = utf8 | ||
# The MariaDB configuration file | ||
# | ||
# The MariaDB/MySQL tools read configuration files in the following order: | ||
# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults, | ||
# 2. "/etc/mysql/conf.d/*.cnf" to set global options. | ||
# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options. | ||
# 4. "~/.my.cnf" to set user-specific options. | ||
# | ||
# If the same option is defined multiple times, the last one will apply. | ||
# | ||
# One can use all long options that the program supports. | ||
# Run program with --help to get a list of available options and with | ||
# --print-defaults to see which it would actually understand and use. | ||
|
||
[mysqld] | ||
# | ||
# * Character sets | ||
# | ||
# Default is Latin1, if you need UTF-8 set all this (also in client section) | ||
# This group is read both by the client and the server | ||
# use it for options that affect everything | ||
# | ||
#character-set-server = utf8 | ||
#collation-server = utf8_general_ci | ||
#character_set_server = utf8 | ||
#collation_server = utf8_general_ci | ||
[client-server] | ||
|
||
# Import all .cnf files from configuration directory | ||
!includedir /etc/mysql/conf.d/ | ||
!includedir /etc/mysql/mariadb.conf.d/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# | ||
# This group is read by the client library | ||
# Use it for options that affect all clients, but not the server | ||
# | ||
|
||
[client] | ||
# Default is Latin1, if you need UTF-8 set this (also in server section) | ||
default-character-set = utf8mb4 | ||
|
||
# socket location | ||
socket = /var/run/mysqld/mysqld.sock | ||
|
||
# Example of client certificate usage | ||
# ssl-cert=/etc/mysql/client-cert.pem | ||
# ssl-key=/etc/mysql/client-key.pem | ||
# | ||
# Allow only TLS encrypted connections | ||
# ssl-verify-server-cert=on | ||
|
||
# This group is *never* read by mysql client library, though this | ||
# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL | ||
# client anyway. | ||
# If you use the same .cnf file for MySQL and MariaDB, | ||
# use it for MariaDB-only client options | ||
[client-mariadb] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# | ||
# These groups are read by MariaDB command-line tools | ||
# Use it for options that affect only one utility | ||
# | ||
|
||
[mysql] | ||
# Default is Latin1, if you need UTF-8 set this (also in server section) | ||
default-character-set = utf8mb4 | ||
|
||
[mysql_upgrade] | ||
|
||
[mysqladmin] | ||
|
||
[mysqlbinlog] | ||
|
||
[mysqlcheck] | ||
|
||
[mysqldump] | ||
|
||
[mysqlimport] | ||
|
||
[mysqlshow] | ||
|
||
[mysqlslap] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# NOTE: This file is read only by the traditional SysV init script, not systemd. | ||
# MariaDB systemd does _not_ utilize mysqld_safe nor read this file. | ||
# | ||
# For similar behaviour, systemd users should create the following file: | ||
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf | ||
# | ||
# To achieve the same result as the default 50-mysqld_safe.cnf, please create | ||
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf | ||
# with the following contents: | ||
# | ||
# [Service] | ||
# User=mysql | ||
# StandardOutput=syslog | ||
# StandardError=syslog | ||
# SyslogFacility=daemon | ||
# SyslogLevel=err | ||
# SyslogIdentifier=mysqld | ||
# | ||
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/ | ||
# | ||
|
||
[mysqld_safe] | ||
# This will be passed to all mysql clients | ||
# It has been reported that passwords should be enclosed with ticks/quotes | ||
# especially if they contain "#" chars... | ||
# Remember to edit /etc/mysql/debian.cnf when changing the socket location. | ||
socket = /var/run/mysqld/mysqld.sock | ||
nice = 0 | ||
skip_log_error | ||
syslog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
# | ||
# These groups are read by MariaDB server. | ||
# Use it for options that only the server (but not clients) should see | ||
# | ||
# See the examples of server my.cnf files in /usr/share/mysql | ||
|
||
# this is read by the standalone daemon and embedded servers | ||
[server] | ||
|
||
# this is only for the mysqld standalone daemon | ||
[mysqld] | ||
|
||
# | ||
# * Basic Settings | ||
# | ||
user = mysql | ||
pid-file = /run/mysqld/mysqld.pid | ||
socket = /run/mysqld/mysqld.sock | ||
#port = 3306 | ||
basedir = /usr | ||
datadir = /var/lib/mysql | ||
tmpdir = /tmp | ||
lc-messages-dir = /usr/share/mysql | ||
#skip-external-locking | ||
|
||
# Instead of skip-networking the default is now to listen only on | ||
# localhost which is more compatible and is not less secure. | ||
bind-address = 127.0.0.1 | ||
|
||
# | ||
# * Fine Tuning | ||
# | ||
#key_buffer_size = 16M | ||
#max_allowed_packet = 16M | ||
#thread_stack = 192K | ||
#thread_cache_size = 8 | ||
# This replaces the startup script and checks MyISAM tables if needed | ||
# the first time they are touched | ||
#myisam_recover_options = BACKUP | ||
#max_connections = 100 | ||
#table_cache = 64 | ||
#thread_concurrency = 10 | ||
|
||
# | ||
# * Query Cache Configuration | ||
# | ||
#query_cache_limit = 1M | ||
query_cache_size = 16M | ||
|
||
# | ||
# * Logging and Replication | ||
# | ||
# Both location gets rotated by the cronjob. | ||
# Be aware that this log type is a performance killer. | ||
# As of 5.1 you can enable the log at runtime! | ||
#general_log_file = /var/log/mysql/mysql.log | ||
#general_log = 1 | ||
# | ||
# Error log - should be very few entries. | ||
# | ||
log_error = /var/log/mysql/error.log | ||
# | ||
# Enable the slow query log to see queries with especially long duration | ||
#slow_query_log_file = /var/log/mysql/mariadb-slow.log | ||
#long_query_time = 10 | ||
#log_slow_rate_limit = 1000 | ||
#log_slow_verbosity = query_plan | ||
#log-queries-not-using-indexes | ||
# | ||
# The following can be used as easy to replay backup logs or for replication. | ||
# note: if you are setting up a replication slave, see README.Debian about | ||
# other settings you may need to change. | ||
#server-id = 1 | ||
#log_bin = /var/log/mysql/mysql-bin.log | ||
expire_logs_days = 10 | ||
#max_binlog_size = 100M | ||
#binlog_do_db = include_database_name | ||
#binlog_ignore_db = exclude_database_name | ||
|
||
# | ||
# * Security Features | ||
# | ||
# Read the manual, too, if you want chroot! | ||
#chroot = /var/lib/mysql/ | ||
# | ||
# For generating SSL certificates you can use for example the GUI tool "tinyca". | ||
# | ||
#ssl-ca = /etc/mysql/cacert.pem | ||
#ssl-cert = /etc/mysql/server-cert.pem | ||
#ssl-key = /etc/mysql/server-key.pem | ||
# | ||
# Accept only connections using the latest and most secure TLS protocol version. | ||
# ..when MariaDB is compiled with OpenSSL: | ||
#ssl-cipher = TLSv1.2 | ||
# ..when MariaDB is compiled with YaSSL (default in Debian): | ||
#ssl = on | ||
|
||
# | ||
# * Character sets | ||
# | ||
# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full | ||
# utf8 4-byte character set. See also client.cnf | ||
# | ||
character-set-server = utf8mb4 | ||
collation-server = utf8mb4_general_ci | ||
|
||
# | ||
# * InnoDB | ||
# | ||
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. | ||
# Read the manual for more InnoDB related options. There are many! | ||
|
||
# | ||
# * Unix socket authentication plugin is built-in since 10.0.22-6 | ||
# | ||
# Needed so the root database user can authenticate without a password but | ||
# only when running as the unix root user. | ||
# | ||
# Also available for other users if required. | ||
# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/ | ||
|
||
# this is only for embedded server | ||
[embedded] | ||
|
||
# This group is only read by MariaDB servers, not by MySQL. | ||
# If you use the same .cnf file for MySQL and MariaDB, | ||
# you can put MariaDB-only options here | ||
[mariadb] | ||
|
||
# This group is only read by MariaDB-10.5 servers. | ||
# If you use the same .cnf file for MariaDB of different versions, | ||
# use this group for options that older servers don't understand | ||
[mariadb-10.5] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# | ||
# * Galera-related settings | ||
# | ||
[galera] | ||
# Mandatory settings | ||
#wsrep_on=ON | ||
#wsrep_provider= | ||
#wsrep_cluster_address= | ||
#binlog_format=row | ||
#default_storage_engine=InnoDB | ||
#innodb_autoinc_lock_mode=2 | ||
# | ||
# Allow server to accept connections on all interfaces. | ||
# | ||
#bind-address=0.0.0.0 | ||
# | ||
# Optional setting | ||
#wsrep_slave_threads=1 | ||
#innodb_flush_log_at_trx_commit=0 |
Oops, something went wrong.