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

Nirbhay Choubey · Nirbhay Choubey · commit 746c755d423d · 2014-08-05T19:00:54.000-04:00
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]

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ innodb_flush_method = O_DIRECT`
`165`	`165`	`#query_cache_size=0`
`166`	`166`	`#`
`167`	`167`	`# Optional setting`
`168`		`-#innodb_flush_log_at_trx_commit=2`
	`168`	`+#innodb_flush_log_at_trx_commit=0`
`169`	`169`
`170`	`170`	`[mysqldump]`
`171`	`171`	`quick`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#query_cache_size=0`
`26`	`26`	`#`
`27`	`27`	`# Optional setting`
`28`		`-#innodb_flush_log_at_trx_commit=2`
	`28`	`+#innodb_flush_log_at_trx_commit=0`
`29`	`29`
`30`	`30`	`# this is only for embedded server`
`31`	`31`	`[embedded]`