From 3087d9d221e7138b56c2ac1c64f29ba881ea6e93 Mon Sep 17 00:00:00 2001 From: Dirkjan Bussink Date: Tue, 17 Dec 2024 17:47:55 +0100 Subject: [PATCH] Use non-deprecated flags to skip replication This currently triggers a warning on more recent MySQL versions. Instead we can move it to the version specific files so we can use the correct non-deprecated name. Signed-off-by: Dirkjan Bussink --- config/mycnf/default.cnf | 4 ---- config/mycnf/mariadb10.cnf | 5 +++++ config/mycnf/mysql57.cnf | 5 +++++ config/mycnf/mysql80.cnf | 5 +++++ config/mycnf/mysql8026.cnf | 5 +++++ config/mycnf/mysql84.cnf | 5 +++++ config/mycnf/sbr.cnf | 3 --- 7 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 config/mycnf/sbr.cnf diff --git a/config/mycnf/default.cnf b/config/mycnf/default.cnf index c17165f9959..25e5398c87a 100644 --- a/config/mycnf/default.cnf +++ b/config/mycnf/default.cnf @@ -16,10 +16,6 @@ secure-file-priv = {{.SecureFilePriv}} server-id = {{.ServerID}} -# all db instances should skip starting replication threads - that way we can do any -# additional configuration (like enabling semi-sync) before we connect to -# the source. -skip_slave_start socket = {{.SocketFile}} tmpdir = {{.TmpDir}} diff --git a/config/mycnf/mariadb10.cnf b/config/mycnf/mariadb10.cnf index 120bd7b7d00..fb0becb7dcd 100644 --- a/config/mycnf/mariadb10.cnf +++ b/config/mycnf/mariadb10.cnf @@ -1,5 +1,10 @@ # This file is auto-included when MariaDB 10 is detected. +# all db instances should skip starting replication threads - that way we can do any +# additional configuration (like enabling semi-sync) before we connect to +# the source. +skip_slave_start + # Semi-sync replication is required for automated unplanned failover # (when the primary goes away). Here we just load the plugin so it's # available if desired, but it's disabled at startup. diff --git a/config/mycnf/mysql57.cnf b/config/mycnf/mysql57.cnf index 44c462749a7..485904bb2bd 100644 --- a/config/mycnf/mysql57.cnf +++ b/config/mycnf/mysql57.cnf @@ -1,5 +1,10 @@ # This file is auto-included when MySQL 5.7 is detected. +# all db instances should skip starting replication threads - that way we can do any +# additional configuration (like enabling semi-sync) before we connect to +# the source. +skip_slave_start + # MySQL 5.7 does not enable the binary log by default, and # info repositories default to file diff --git a/config/mycnf/mysql80.cnf b/config/mycnf/mysql80.cnf index 13447a7de0a..3f4297ba400 100644 --- a/config/mycnf/mysql80.cnf +++ b/config/mycnf/mysql80.cnf @@ -1,5 +1,10 @@ # This file is auto-included when MySQL 8.0 is detected. +# all db instances should skip starting replication threads - that way we can do any +# additional configuration (like enabling semi-sync) before we connect to +# the source. +skip_slave_start + # MySQL 8.0 enables binlog by default with sync_binlog and TABLE info repositories # It does not enable GTIDs or enforced GTID consistency diff --git a/config/mycnf/mysql8026.cnf b/config/mycnf/mysql8026.cnf index c7755be488f..df63a589918 100644 --- a/config/mycnf/mysql8026.cnf +++ b/config/mycnf/mysql8026.cnf @@ -1,5 +1,10 @@ # This file is auto-included when MySQL 8.0.26 or later is detected. +# all db instances should skip starting replication threads - that way we can do any +# additional configuration (like enabling semi-sync) before we connect to +# the source. +skip_replica_start + # MySQL 8.0 enables binlog by default with sync_binlog and TABLE info repositories # It does not enable GTIDs or enforced GTID consistency diff --git a/config/mycnf/mysql84.cnf b/config/mycnf/mysql84.cnf index 93e4bd571e1..e75c885af39 100644 --- a/config/mycnf/mysql84.cnf +++ b/config/mycnf/mysql84.cnf @@ -1,5 +1,10 @@ # This file is auto-included when MySQL 8.4.0 or later is detected. +# all db instances should skip starting replication threads - that way we can do any +# additional configuration (like enabling semi-sync) before we connect to +# the source. +skip_replica_start + # MySQL 8.0 enables binlog by default with sync_binlog and TABLE info repositories # It does not enable GTIDs or enforced GTID consistency diff --git a/config/mycnf/sbr.cnf b/config/mycnf/sbr.cnf deleted file mode 100644 index 5808e0430f3..00000000000 --- a/config/mycnf/sbr.cnf +++ /dev/null @@ -1,3 +0,0 @@ -# This file is used to allow legacy tests to pass -# In theory it should not be required -binlog_format=statement