diff --git a/mariadb/srv/mariadb/conf/my.cnf b/mariadb/srv/mariadb/conf/my.cnf index daa8fbd..a13fbe5 100644 --- a/mariadb/srv/mariadb/conf/my.cnf +++ b/mariadb/srv/mariadb/conf/my.cnf @@ -1,30 +1,12 @@ -# Example MariaDB config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MariaDB plays -# an important part, or systems up to 128M where MariaDB is used together with -# other programs (such as a web server) -# -# MariaDB programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, do: -# 'my_print_defaults --help' and see what is printed under -# Default options are read from the following files in the given order: -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MariaDB clients [client] -port = 3306 -socket = /run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock [mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock +port = 3306 +socket = /run/mysqld/mysqld.sock skip-external-locking +skip-name-resolve key_buffer_size = 16M max_allowed_packet = 1M table_open_cache = 64 @@ -33,34 +15,9 @@ net_buffer_length = 8K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M - -#general_log = 1 - -# Replication Master Server (default) -# binary logging is required for replication log-bin=mysql-bin - -# binary logging format - mixed recommended binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Uncomment the following if you are using InnoDB tables -innodb_data_home_dir = /var/lib/mysql -innodb_data_file_path = ibdata1:10M:autoextend -innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -innodb_buffer_pool_size = 16M -innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 5M -innodb_log_buffer_size = 8M -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 50 +server-id = 1 [mysqldump] quick @@ -68,8 +25,6 @@ max_allowed_packet = 16M [mysql] no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates [myisamchk] key_buffer_size = 20M