diff options
| author | Monty <monty@mariadb.org> | 2019-07-18 15:32:22 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-07-18 15:32:22 +0300 |
| commit | 47334649752e109360c9e22b8f8019a0df51fe93 (patch) | |
| tree | 343a69f76e7aee854ed7c8c399b94fd0a05a9465 /client/mysql.cc | |
| parent | 5a95a33e309d0b2c6bc0f938ad925e3f74b0f921 (diff) | |
| download | mariadb-git-47334649752e109360c9e22b8f8019a0df51fe93.tar.gz | |
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
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 47ab7644a50..d3d273c3a72 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1034,7 +1034,7 @@ static COMMANDS commands[] = { }; static const char *load_default_groups[]= -{ "mysql", "client", "client-server", "client-mariadb", 0 }; +{ "mysql", "mariadb-client", "client", "client-server", "client-mariadb", 0 }; static int embedded_server_arg_count= 0; static char *embedded_server_args[MAX_SERVER_ARGS]; |