diff options
| author | unknown <serg@serg.mylan> | 2004-08-24 17:24:23 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-24 17:24:23 +0200 |
| commit | a49c12f5152791042eeecac19db9054ad845e3dd (patch) | |
| tree | 35c94403332fed86012546db775d8817473f7435 /sql/mysqld.cc | |
| parent | 62a63815e119807134de74edb78e478b75a6b874 (diff) | |
| parent | 9d1a9d72cba1aa828e631f520540411d7508a4e0 (diff) | |
| download | mariadb-git-a49c12f5152791042eeecac19db9054ad845e3dd.tar.gz | |
manually merged
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/binary.result:
Auto merged
mysql-test/r/truncate.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/truncate.test:
Auto merged
mysys/my_lib.c:
Auto merged
strings/my_vsnprintf.c:
Auto merged
support-files/Makefile.am:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9b40768f0da..4ef41e62f32 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4241,7 +4241,7 @@ Disable with --skip-isam.", OPT_ARG, 0, 0, 0, 0, 0, 0}, {"log-warnings", 'W', "Log some non-critical warnings to the error log file. Use this option twice or --log-warnings=2 if you also want 'Aborted connections' warnings.", (gptr*) &global_system_variables.log_warnings, - (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, 0, + (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, ~0L, 0, 0, 0}, {"low-priority-updates", OPT_LOW_PRIORITY_UPDATES, "INSERT/DELETE/UPDATE has lower priority than selects.", @@ -4551,7 +4551,7 @@ replicating a LOAD DATA INFILE command.", NO_ARG, 0, 0, 0, 0, 0, 0}, {"warnings", 'W', "Deprecated; use --log-warnings instead.", (gptr*) &global_system_variables.log_warnings, - (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, 0, + (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, ~0L, 0, 0, 0}, { "back_log", OPT_BACK_LOG, "The number of outstanding connection requests MySQL can have. This comes into play when the main MySQL thread gets very many connection requests in a very short time.", |