summaryrefslogtreecommitdiff
path: root/debian/additions
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-07-21 17:27:06 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-07-21 17:27:06 -0400
commite5cea60933328af408c3d2636eeed0597e6f0e2e (patch)
tree11c100a43a62c44de266bef7a19b43a8f748ba84 /debian/additions
parenteaa0fe7cf859ad822f71bbaa2a47b23b4963ba9d (diff)
downloadmariadb-git-e5cea60933328af408c3d2636eeed0597e6f0e2e.tar.gz
Local merge of patch for MDEV-3896 from maria-5.5-galera.
Diffstat (limited to 'debian/additions')
-rw-r--r--debian/additions/my.cnf16
1 files changed, 15 insertions, 1 deletions
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