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

MariaDB · Aug 5, 2014 · 746c755 · 746c755
1 parent 30b5a4d
commit 746c755
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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]