Merge pull request #5704 from planetscale/morgo-fix-5326-regression

Fix regression introduced by #5326
vitessio · Jan 13, 2020 · 1b384b8 · 1b384b8
2 parents e677f35 + 92c7b11
commit 1b384b8
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 25 deletions.
diff --git a/config/mycnf/default.cnf b/config/mycnf/default.cnf
@@ -4,6 +4,7 @@ datadir = {{.DataDir}}
 innodb_data_home_dir = {{.InnodbDataHomeDir}}
 innodb_log_group_home_dir = {{.InnodbLogGroupHomeDir}}
 log-error = {{.ErrorLogPath}}
+log-bin = {{.BinLogPath}}
 pid-file = {{.PidFile}}
 port = {{.MysqlPort}}
 

diff --git a/config/mycnf/master_mariadb100.cnf b/config/mycnf/master_mariadb100.cnf
@@ -31,7 +31,6 @@ collation_server = utf8_general_ci
 
 expire_logs_days = 3
 
-log_bin
 sync_binlog = 1
 binlog_format = ROW
 log_slave_updates

diff --git a/config/mycnf/master_mariadb101.cnf b/config/mycnf/master_mariadb101.cnf
@@ -31,7 +31,6 @@ collation_server = utf8_general_ci
 
 expire_logs_days = 3
 
-log_bin
 sync_binlog = 1
 binlog_format = ROW
 log_slave_updates

diff --git a/config/mycnf/master_mariadb102.cnf b/config/mycnf/master_mariadb102.cnf
@@ -26,7 +26,6 @@ collation_server = utf8_general_ci
 
 expire_logs_days = 3
 
-log_bin
 sync_binlog = 1
 binlog_format = ROW
 log_slave_updates

diff --git a/config/mycnf/master_mariadb103.cnf b/config/mycnf/master_mariadb103.cnf
@@ -17,7 +17,6 @@ collation_server = utf8_general_ci
 
 expire_logs_days = 3
 
-log_bin
 sync_binlog = 1
 binlog_format = ROW
 log_slave_updates

diff --git a/config/mycnf/master_mariadb104.cnf b/config/mycnf/master_mariadb104.cnf
@@ -17,7 +17,6 @@ collation_server = utf8_general_ci
 
 expire_logs_days = 3
 
-log_bin
 sync_binlog = 1
 binlog_format = ROW
 log_slave_updates

diff --git a/config/mycnf/master_mysql56.cnf b/config/mycnf/master_mysql56.cnf
@@ -4,7 +4,6 @@
 # the default for sync_binlog is unsafe. The format is TABLE, and
 # info repositories also default to file.
 
-log_bin
 sync_binlog = 1
 gtid_mode = ON
 binlog_format = ROW

diff --git a/config/mycnf/master_mysql57.cnf b/config/mycnf/master_mysql57.cnf
@@ -4,7 +4,6 @@
 # info repositories default to file
 
 gtid_mode = ON
-log_bin
 log_slave_updates
 enforce_gtid_consistency
 expire_logs_days = 3

diff --git a/go/vt/mysqlctl/rice-box.go b/go/vt/mysqlctl/rice-box.go