diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 20:56:35 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 20:56:35 +0200 |
| commit | b533cd5c83f4a721dba960b97fa94abcad819498 (patch) | |
| tree | c69a35bf725afc24c5f992fbb309f51812f58598 /mysys | |
| parent | 2d9a417d56f03f1af44649a0c3f5d757f717fffc (diff) | |
| download | mariadb-git-b533cd5c83f4a721dba960b97fa94abcad819498.tar.gz | |
Only write to the error log if --log-error is specified and --console is not specified
(On Windows --log-error is enabled by default)
mysys/my_getopt.c:
Call get_one_option() also for boolean values.
scripts/mysqld_safe.sh:
Add option --log-error
sql/log.cc:
Fix for --log-error
sql/mysql_priv.h:
Fix for --log-error
sql/mysqld.cc:
Fix for --log-error
sql/sql_udf.cc:
Lock the mysql/func table properly
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 21adb9374ce..c6fe606eaaf 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -300,7 +300,8 @@ int handle_options(int *argc, char ***argv, */ *((my_bool*) optp->value)= (my_bool) (!optend || *optend == '1'); (*argc)--; - continue; /* For GET_BOOL get_one_option() shouldn't be called */ + get_one_option(optp->id, optp, argument); + continue; } argument= optend; } @@ -348,7 +349,8 @@ int handle_options(int *argc, char ***argv, if (optp->var_type == GET_BOOL && optp->arg_type == NO_ARG) { *((my_bool*) optp->value)= (my_bool) 1; - continue; /* For GET_BOOL get_one_option() shouldn't be called */ + get_one_option(optp->id, optp, argument); + continue; } else if (optp->arg_type == REQUIRED_ARG || optp->arg_type == OPT_ARG) |