Skip to content

Fix regression introduced by #5326 #5704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morgo merged 1 commit into from
Jan 13, 2020
Merged

Fix regression introduced by #5326 #5704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/mycnf/default.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mariadb100.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ collation_server = utf8_general_ci

expire_logs_days = 3

log_bin
sync_binlog = 1
binlog_format = ROW
log_slave_updates
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mariadb101.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ collation_server = utf8_general_ci

expire_logs_days = 3

log_bin
sync_binlog = 1
binlog_format = ROW
log_slave_updates
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mariadb102.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ collation_server = utf8_general_ci

expire_logs_days = 3

log_bin
sync_binlog = 1
binlog_format = ROW
log_slave_updates
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mariadb103.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ collation_server = utf8_general_ci

expire_logs_days = 3

log_bin
sync_binlog = 1
binlog_format = ROW
log_slave_updates
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mariadb104.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ collation_server = utf8_general_ci

expire_logs_days = 3

log_bin
sync_binlog = 1
binlog_format = ROW
log_slave_updates
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mysql56.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/mycnf/master_mysql57.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# info repositories default to file

gtid_mode = ON
log_bin
log_slave_updates
enforce_gtid_consistency
expire_logs_days = 3
Expand Down
36 changes: 18 additions & 18 deletions go/vt/mysqlctl/rice-box.go
View file
Open in desktop

Large diffs are not rendered by default.