database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 192.168.0.10:mysql/work/my51-work

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
This commit is contained in:
msvensson@shellback.(none)
2006-11-29 22:52:32 +01:00
parent f7bbcb71cc 21d6f823af
commit 7146466eef
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@@ -2789,13 +2789,13 @@ static int init_common_variables(const char *conf_file_name, int argc,
!(log_output_options & LOG_NONE))
sql_print_warning("Although a path was specified for the "
"--log option, log tables are used. "
"To enable logging to file use the --log-output option.");
"To enable logging to files use the --log-output option.");
if (opt_slow_log && opt_slow_logname && !(log_output_options & LOG_FILE)
&& !(log_output_options & LOG_NONE))
sql_print_warning("Although a path was specified for the "
"--log-slow-queries option, log tables are used. "
"To enable logging to file use the --log-output option.");
"To enable logging to files use the --log-output option.");
if (!opt_logname)
opt_logname= make_default_log_name(buff, ".log");