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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index b68c6f56015..0e9f4de09fe 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -47,8 +47,10 @@ parse_arguments() { # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])! --ledir=*) ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;; + # err-log should be removed in 5.0 --err-log=*) err_log=`echo "$arg" | sed -e "s;--err-log=;;"` ;; - # QQ The --open-files should be removed + --log-error=*) err_log=`echo "$arg" | sed -e "s;--log-error=;;"` ;; + # QQ The --open-files should be removed in 5.0 --open-files=*) open_files=`echo "$arg" | sed -e "s;--open-files=;;"` ;; --open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;; --core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core-file-size=;;"` ;; |