diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-07-27 12:44:15 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-07-27 12:44:15 +0300 |
| commit | 14c99fccc9523bcc42f44c6e3d523c60d05a823b (patch) | |
| tree | 7e85f61fd2a8bcfe4b6892cc497d68c3d9aba173 /sql | |
| parent | a0f0f3853af938e6425706e59236fa4a2ee38ff2 (diff) | |
| parent | 2d667dc37f506a337425834b0ddbb22b79f98df9 (diff) | |
| download | mariadb-git-14c99fccc9523bcc42f44c6e3d523c60d05a823b.tar.gz | |
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 869048cee93..ec55af0a021 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4528,7 +4528,7 @@ replicating a LOAD DATA INFILE command.", 0, 0, 0, 0, 0, 0}, {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"log-warnings", 'W', "Log some not critical warnings to the log file.", + {"log-warnings", 'W', "Log some not critical warnings to the log file. Use this option twice, or --log-warnings=2 if you want 'Aborted connections' warning to be logged in the error log file.", (gptr*) &global_system_variables.log_warnings, (gptr*) &max_system_variables.log_warnings, 0, GET_ULONG, OPT_ARG, 1, 0, 0, 0, 0, 0}, |