From 47334649752e109360c9e22b8f8019a0df51fe93 Mon Sep 17 00:00:00 2001 From: Monty Date: Thu, 18 Jul 2019 15:32:22 +0300 Subject: Fixed that mariadb-# binaries reads their corresponding entry from my.cnf - Added mariadb-# to load_default_groups to all mariadb-# scripts and mariadb-binaries. - Added mariadbd and mariadbd-"version" to load_default_groups for the mysqld/mariadb server - Added mariadb-client to load_default_groups for the mysql/mariadb client Other things - Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version - mysql_install_db will now automatically detect if run from srcdir --- client/mysqltest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client/mysqltest.cc') diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 139377d3889..3c9b26d0412 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -136,7 +136,8 @@ static my_bool server_initialized= 0; static my_bool is_windows= 0; static char **default_argv; static const char *load_default_groups[]= -{ "mysqltest", "client", "client-server", "client-mariadb", 0 }; +{ "mysqltest", "mariadb-test", "client", "client-server", "client-mariadb", + 0 }; static char line_buffer[MAX_DELIMITER_LENGTH], *line_buffer_pos= line_buffer; /* Info on properties that can be set with --enable_X and --disable_X */ -- cgit v1.2.1