From b1ab4ec4e25b231da77a2683d69366ab5dea4d66 Mon Sep 17 00:00:00 2001 From: Anel Husakovic Date: Thu, 24 Aug 2023 15:37:46 +0200 Subject: [PATCH] Remove duplicated default client include from replication my.cnf - `default_client` is included already in rpl_1slave_base.cnf`, so remove it from `my.cnf` - Remove option group for `mysqld` server as and add comment how to override specific settings for specific server - Reviewer: --- mysql-test/suite/rpl/my.cnf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/rpl/my.cnf b/mysql-test/suite/rpl/my.cnf index 74233b056c7..d61e32ed51a 100644 --- a/mysql-test/suite/rpl/my.cnf +++ b/mysql-test/suite/rpl/my.cnf @@ -1,8 +1,8 @@ # Use settings from rpl_1slave_base.cnf # add setting to connect the slave to the master by default !include rpl_1slave_base.cnf -!include include/default_client.cnf - - -[mysqld.2] - +# Override specific server settings using [mariadb-x.y] option group +# from `test.cnf` file right after including this file. +# E.g. after !include ../my.cnf, in your `test.cnf`, specify your configuration +# in option group e.g [mysqld.x], so that number `x` corresponds to the number +# in the rpl server topology.