summaryrefslogtreecommitdiff
path: root/debian/additions
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-08-05 19:00:54 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-08-05 19:00:54 -0400
commit746c755d423d02a41a8e22a80e84ed4eff260ba4 (patch)
treef9a3e54a48ed94728418cfe4f5a01e4d84584fe4 /debian/additions
parent30b5a4de5d169cb82829938ffbe60512be89ffef (diff)
downloadmariadb-git-746c755d423d02a41a8e22a80e84ed4eff260ba4.tar.gz
MDEV-6495: local merge from maria-5.5-galera.
Diffstat (limited to 'debian/additions')
-rw-r--r--debian/additions/my.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
index 962a65c89ae..eed29b90a2b 100644
--- a/debian/additions/my.cnf
+++ b/debian/additions/my.cnf
@@ -165,7 +165,7 @@ innodb_flush_method = O_DIRECT
#query_cache_size=0
#
# Optional setting
-#innodb_flush_log_at_trx_commit=2
+#innodb_flush_log_at_trx_commit=0
[mysqldump]
quick