From e5cea60933328af408c3d2636eeed0597e6f0e2e Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Mon, 21 Jul 2014 17:27:06 -0400
Subject: Local merge of patch for MDEV-3896 from maria-5.5-galera.

---
 support-files/rpm/server.cnf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'support-files/rpm')

diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
index a197868d16c..850c8db7dd3 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]
 
-- 
cgit v1.2.1