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 | 8fd4c59ff6586cebf76e83a27d1a21c48e2f4404 (patch) | |
| tree | 6622abfe7e4ba8762ceaaae473f6bbf0452be0e1 /sql-common | |
| parent | 428e28e00c679ca6f3a997e0303604d881e361c3 (diff) | |
| parent | 061b5d652394e0bb77a008666b8632a9e0612225 (diff) | |
| download | mariadb-git-8fd4c59ff6586cebf76e83a27d1a21c48e2f4404.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; |