summaryrefslogtreecommitdiff
path: root/support-files/rpm
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-06 16:14:23 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-06 16:14:23 +0100
commit8e7649867f23ef4fca5ddb6678a66e414026ef7b (patch)
treeff7649743a3bf13ea13eb80f1126a13cd756d335 /support-files/rpm
parentf9448bcb2153aac614ecb260a4dd7f27b04f17a2 (diff)
parent7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (diff)
downloadmariadb-git-8e7649867f23ef4fca5ddb6678a66e414026ef7b.tar.gz
Merge 10.0-galera into 10.1
Diffstat (limited to 'support-files/rpm')
-rw-r--r--support-files/rpm/server.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
index b3c3a3abb38..303095b48d2 100644
--- a/support-files/rpm/server.cnf
+++ b/support-files/rpm/server.cnf
@@ -18,13 +18,13 @@
# Mandatory settings
#wsrep_provider=
#wsrep_cluster_address=
-#wsrep_slave_threads=1
#binlog_format=row
#default_storage_engine=InnoDB
#innodb_autoinc_lock_mode=2
#bind-address=0.0.0.0
#
# Optional setting
+#wsrep_slave_threads=1
#innodb_flush_log_at_trx_commit=0
# this is only for embedded server