From 961afb407e4706964fc3ca89aedcc033af3185ab Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Fri, 2 Oct 2026 16:06:28 +0200
Subject: [PATCH] MDEV-11111: mtr gives the private server the [embedded] group
 again

Like the embedded server before it, the private mariadbd reads the [server]
and [embedded] groups by default, and mtr generates [embedded] from
[mysqld] and [mysqld.1] for --embedded-server. Use it again instead of
passing the groups of mysqld.1 with --embedded-defaults-groups and a
--defaults-group-suffix.

Tested on Linux and Windows with --embedded-server (main, sys_vars,
embedded, encryption and versioning tests).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 mysql-test/mariadb-test-run.pl | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index b4aaef38614..3f72caafee3 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -4668,23 +4668,16 @@ sub start_check_warnings ($$) {
     # and append them to args prefixed
     # with --sever-arg=
 
-    # The server is a normal mariadbd (a private one, started by mysqltest),
-    # which reads the groups of a regular test server: use [mysqld.1].
-    my $mysqld=  $config->group('mysqld.1')
-      or mtr_error("Could not get [mysqld.1] section");
+    # The server is a private mariadbd, started by mysqltest. Like the
+    # embedded server before it, it reads the [server] and [embedded] groups.
+    my $mysqld=  $config->group('embedded')
+      or mtr_error("Could not get [embedded] section");
 
     my $mysqld_args;
     mtr_init_args(\$mysqld_args);
     my $extra_opts= get_extra_opts($mysqld, $tinfo);
     mysqld_arguments($mysqld_args, $mysqld, $extra_opts);
-    # --defaults-group-suffix must follow --defaults-file directly
-    splice(@$mysqld_args, 1, 0,
-           "--defaults-group-suffix=" . $mysqld->after('mysqld'));
     mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args;
-    # the private server reads the groups of a server here, as the test
-    # configuration is written for one (the default is [server] and [embedded])
-    mtr_add_arg($args, "--server-arg=--embedded-defaults-groups=%s",
-                "mysqld,server,mariadb,mariadbd,client-server");
     # the old embedded server had no TLS; keep the SSL tests skipped
     mtr_add_arg($args, "--server-arg=--skip-ssl");
   }
@@ -5788,23 +5781,16 @@ sub start_mysqltest ($) {
     # and append them to args prefixed
     # with --sever-arg=
 
-    # The server is a normal mariadbd (a private one, started by mysqltest),
-    # which reads the groups of a regular test server: use [mysqld.1].
-    my $mysqld=  $config->group('mysqld.1')
-      or mtr_error("Could not get [mysqld.1] section");
+    # The server is a private mariadbd, started by mysqltest. Like the
+    # embedded server before it, it reads the [server] and [embedded] groups.
+    my $mysqld=  $config->group('embedded')
+      or mtr_error("Could not get [embedded] section");
 
     my $mysqld_args;
     mtr_init_args(\$mysqld_args);
     my $extra_opts= get_extra_opts($mysqld, $tinfo);
     mysqld_arguments($mysqld_args, $mysqld, $extra_opts);
-    # --defaults-group-suffix must follow --defaults-file directly
-    splice(@$mysqld_args, 1, 0,
-           "--defaults-group-suffix=" . $mysqld->after('mysqld'));
     mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args;
-    # the private server reads the groups of a server here, as the test
-    # configuration is written for one (the default is [server] and [embedded])
-    mtr_add_arg($args, "--server-arg=--embedded-defaults-groups=%s",
-                "mysqld,server,mariadb,mariadbd,client-server");
     # the old embedded server had no TLS; keep the SSL tests skipped
     mtr_add_arg($args, "--server-arg=--skip-ssl");
   }