Merge pull request #15 from linuxserver/binlog

aptalca · web-flow · commit 4cc9db2b32c0 · 2017-03-13T16:15:58.000-04:00
Fix binlog location
diff --git a/root/defaults/my.cnf b/root/defaults/my.cnf
@@ -13,6 +13,7 @@ sort_buffer_size	= 4M
 bulk_insert_buffer_size	= 16M
 tmp_table_size		= 32M
 max_heap_table_size	= 32M
+binlog_format=mixed
 #
 # * MyISAM
 #
@@ -115,7 +116,6 @@ innodb_flush_method	= O_DIRECT
 #wsrep_on=ON
 #wsrep_provider=
 #wsrep_cluster_address=
-binlog_format=mixed
 #default_storage_engine=InnoDB
 #innodb_autoinc_lock_mode=2
 #

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ sort_buffer_size = 4M`
`13`	`13`	`bulk_insert_buffer_size = 16M`
`14`	`14`	`tmp_table_size = 32M`
`15`	`15`	`max_heap_table_size = 32M`
	`16`	`+binlog_format=mixed`
`16`	`17`	`#`
`17`	`18`	`# * MyISAM`
`18`	`19`	`#`
`@@ -115,7 +116,6 @@ innodb_flush_method = O_DIRECT`
`115`	`116`	`#wsrep_on=ON`
`116`	`117`	`#wsrep_provider=`
`117`	`118`	`#wsrep_cluster_address=`
`118`		`-binlog_format=mixed`
`119`	`119`	`#default_storage_engine=InnoDB`
`120`	`120`	`#innodb_autoinc_lock_mode=2`
`121`	`121`	`#`