1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2019-08-13 18:57:00 +03:00
830 changed files with 38349 additions and 15168 deletions

View File

@@ -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];