MDEV-6495: local merge from maria-5.5-galera.

746c755d · Nirbhay Choubey · 30b5a4de · 746c755d · 746c755d
Commit 746c755d authored Aug 05, 2014 by Nirbhay Choubey
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

debian/additions/my.cnf debian/additions/my.cnf +1 -1

support-files/rpm/server.cnf support-files/rpm/server.cnf +1 -1

No files found.
--- 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

--- a/support-files/rpm/server.cnf
+++ b/support-files/rpm/server.cnf
@@ -25,7 +25,7 @@
 #query_cache_size=0
 #
 # Optional setting
-#innodb_flush_log_at_trx_commit=2
+#innodb_flush_log_at_trx_commit=0

 # this is only for embedded server
 [embedded]