From 6f33a62f159e143fc529150853535b4a576700eb Mon Sep 17 00:00:00 2001 From: Simon Westersund Date: Fri, 30 Oct 2020 15:05:19 +0200 Subject: [PATCH 1/2] Admin manual: Fix typo in MySQL/MariaDB properties - Change dashes to underscores in the property names. Verified the names via the following documentation pages: - MySQL: https://dev.mysql.com/doc/refman/8.0/en/server-option-variable-reference.html - MariaDB: https://mariadb.com/kb/en/server-system-variables/ Signed-off-by: Simon Westersund --- .../linux_database_configuration.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index c7f3661fa..93a020c57 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -70,8 +70,8 @@ Your :file:`/etc/mysql/my.cnf` could look like this: query_cache_size = 64M tmp_table_size= 64M max_heap_table_size= 64M - slow-query-log = 1 - slow-query-log-file = /var/log/mysql/slow.log + slow_query_log = 1 + slow_query_log_file = /var/log/mysql/slow.log long_query_time = 1 [client-server] @@ -82,8 +82,8 @@ Your :file:`/etc/mysql/my.cnf` could look like this: default-character-set = utf8mb4 [mysqld] - character-set-server = utf8mb4 - collation-server = utf8mb4_general_ci + character_set_server = utf8mb4 + collation_server = utf8mb4_general_ci transaction_isolation = READ-COMMITTED binlog_format = ROW innodb_large_prefix=on From 036f47c2e0d4d9d366639e30821de4ab55d47a61 Mon Sep 17 00:00:00 2001 From: Simon Westersund Date: Fri, 30 Oct 2020 15:13:21 +0200 Subject: [PATCH 2/2] Admin manual: Fix another typo and missing value - "skip_server_name" with underscores. - Add "= 1" which was missing. Assuming that the previous author meant to enable this, since the default is 0. Signed-off-by: Simon Westersund --- .../configuration_database/linux_database_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 93a020c57..71f84e402 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -58,7 +58,7 @@ Your :file:`/etc/mysql/my.cnf` could look like this: :: [server] - skip-name-resolve + skip_name_resolve = 1 innodb_buffer_pool_size = 128M innodb_buffer_pool_instances = 1 innodb_flush_log_at_trx_commit = 2