diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-26 00:15:33 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-26 00:15:33 +0100 |
| commit | 493a9108aeb1baa9cfccdcd8398aa5683ba70828 (patch) | |
| tree | 81f7b34c3a0ed4a2e2eb140d264a61f6e83b4654 /sql-common | |
| parent | 886d84d6d15f17d91a37453875b386167a9fef76 (diff) | |
| parent | eaed26053da306109d93cbce42b3d275c3e62471 (diff) | |
| download | mariadb-git-493a9108aeb1baa9cfccdcd8398aa5683ba70828.tar.gz | |
merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index d361d35b7a8..28b3cf274bc 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1064,12 +1064,16 @@ void mysql_read_default_options(struct st_mysql_options *options, { int argc; char *argv_buff[1],**argv; - const char *groups[3]; + const char *groups[5]; DBUG_ENTER("mysql_read_default_options"); DBUG_PRINT("enter",("file: %s group: %s",filename,group ? group :"NULL")); argc=1; argv=argv_buff; argv_buff[0]= (char*) "client"; - groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0; + groups[0]= (char*) "client"; + groups[1]= (char*) "client-server"; + groups[2]= (char*) "client-mariadb"; + groups[3]= (char*) group; + groups[4]=0; my_load_defaults(filename, groups, &argc, &argv, NULL); if (argc != 1) /* If some default option */ |