diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:42:36 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:42:36 -0400 |
| commit | 1aefa8029f5828c67fa663122a36e81647c6b8e6 (patch) | |
| tree | 6622abfe7e4ba8762ceaaae473f6bbf0452be0e1 /sql-common | |
| parent | 0d588edf61c93ab67fb7e26101a0fc00d021bb11 (diff) | |
| parent | b7ce2a25211ce86044635d9899e3517600cbda06 (diff) | |
| download | mariadb-git-1aefa8029f5828c67fa663122a36e81647c6b8e6.tar.gz | |
auto-merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index b63ba33bfb8..d2c7e02551d 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1021,7 +1021,7 @@ void mysql_read_default_options(struct st_mysql_options *options, argc=1; argv=argv_buff; argv_buff[0]= (char*) "client"; groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0; - load_defaults(filename, groups, &argc, &argv); + my_load_defaults(filename, groups, &argc, &argv, NULL); if (argc != 1) /* If some default option */ { char **option=argv; |