From 0dadd017501e379546ffe3edae7728b931007be0 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Thu, 17 Jul 2014 16:22:01 -0400 Subject: [PATCH] MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/deb packages * Added "galera" as default option group. * Updated deb/rpm server config files to include mandatory and optional settings (as comments) required to configure Galera cluster. --- debian/additions/my.cnf | 16 +++++++++++++++- include/mysqld_default_groups.h | 3 +++ support-files/rpm/server.cnf | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf index a27f8543f0b..962a65c89ae 100644 --- a/debian/additions/my.cnf +++ b/debian/additions/my.cnf @@ -151,7 +151,21 @@ innodb_flush_method = O_DIRECT # ssl-cert=/etc/mysql/server-cert.pem # ssl-key=/etc/mysql/server-key.pem - +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_provider= +#wsrep_cluster_address= +#wsrep_slave_threads=1 +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +#query_cache_size=0 +# +# Optional setting +#innodb_flush_log_at_trx_commit=2 [mysqldump] quick diff --git a/include/mysqld_default_groups.h b/include/mysqld_default_groups.h index a2e94ddd854..30dfdae1338 100644 --- a/include/mysqld_default_groups.h +++ b/include/mysqld_default_groups.h @@ -5,4 +5,7 @@ const char *load_default_groups[]= { "mysqld", "server", MYSQL_BASE_VERSION, "mariadb", MARIADB_BASE_VERSION, "client-server", +#ifdef WITH_WSREP +"galera", +#endif 0, 0}; diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf index 2025a8b811a..56b4eaf4202 100644 --- a/support-files/rpm/server.cnf +++ b/support-files/rpm/server.cnf @@ -11,6 +11,22 @@ # this is only for the mysqld standalone daemon [mysqld] +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_provider= +#wsrep_cluster_address= +#wsrep_slave_threads=1 +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +#query_cache_size=0 +# +# Optional setting +#innodb_flush_log_at_trx_commit=2 + # this is only for embedded server [embedded]