1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-9136

Browse Source 
into mysql.com:/home/jimw/my/mysql-4.1-clean


mysys/default.c:
  Auto merged
This commit is contained in:
unknown 2005-05-02 08:11:32 -07:00
commit 875ed1e455
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extra/my_print_defaults.c
View File

@ -27,12 +27,20 @@
const char *config_file="my"; /* Default config file */ const char *config_file="my"; /* Default config file */
uint verbose= 0, opt_defaults_file_used= 0; uint verbose= 0, opt_defaults_file_used= 0;
const char *default_dbug_option="d:t:o,/tmp/my_print_defaults.trace";
static struct my_option my_long_options[] = static struct my_option my_long_options[] =
{ {
{"config-file", 'c', "The config file to be used.", {"config-file", 'c', "The config file to be used.",
(gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG, (gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
#ifdef DBUG_OFF
{"debug", '#', "This is a non-debug version. Catch this and exit",
0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else
{"debug", '#', "Output debug log", (gptr*) &default_dbug_option,
(gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"defaults-file", 'c', "Synonym for --config-file.", {"defaults-file", 'c', "Synonym for --config-file.",
(gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG, (gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
@ -95,6 +103,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case 'V': case 'V':
usage(1); usage(1);
exit(0); exit(0);
case '#':
DBUG_PUSH(argument ? argument : default_dbug_option);
break;
} }
return 0; return 0;
} }
@ -118,7 +129,7 @@ static int get_options(int *argc,char ***argv)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int count, error; int count, error;
char **load_default_groups, *tmp_arguments[2], char **load_default_groups, *tmp_arguments[3],
**argument, **arguments; **argument, **arguments;
char *defaults, *extra_defaults; char *defaults, *extra_defaults;
MY_INIT(argv[0]); MY_INIT(argv[0]);

11
mysys/default.c
View File

@ -144,7 +144,7 @@ int load_defaults(const char *conf_file, const char **groups,
int *argc, char ***argv) int *argc, char ***argv)
{ {
DYNAMIC_ARRAY args; DYNAMIC_ARRAY args;
const char **dirs, *forced_default_file; const char **dirs, *forced_default_file, *forced_extra_defaults;
TYPELIB group; TYPELIB group;
my_bool found_print_defaults=0; my_bool found_print_defaults=0;
uint args_used=0; uint args_used=0;
@ -174,13 +174,14 @@ int load_defaults(const char *conf_file, const char **groups,
} }
get_defaults_files(*argc, *argv, get_defaults_files(*argc, *argv,
(char **)&forced_default_file, &defaults_extra_file); (char **)&forced_default_file,
(char **)&forced_extra_defaults);
if (forced_default_file) if (forced_default_file)
forced_default_file= strchr(forced_default_file,'=')+1; forced_default_file= strchr(forced_default_file,'=')+1;
if (defaults_extra_file) if (forced_extra_defaults)
defaults_extra_file= strchr(defaults_extra_file,'=')+1; defaults_extra_file= strchr(forced_extra_defaults,'=')+1;
args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); args_used+= (forced_default_file ? 1 : 0) + (forced_extra_defaults ? 1 : 0);
group.count=0; group.count=0;
group.name= "defaults"; group.name= "defaults";