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

auto-merge

Browse Source
This commit is contained in:
Ignacio Galarza
2009-03-19 09:42:36 -04:00
parent 0d588edf61 b7ce2a2521
commit 1aefa8029f
35 changed files with 364 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

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