mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse source 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin


sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2006-08-02 17:49:27 +04:00
commit ad73be2eb7
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sql/mysqld.cc
View file

@ -2770,6 +2770,19 @@ static int init_common_variables(const char *conf_file_name, int argc,
else else
sys_init_slave.value=my_strdup("",MYF(0)); sys_init_slave.value=my_strdup("",MYF(0));
/* check log options and issue warnings if needed */
if (opt_log && opt_logname && !(log_output_options & LOG_FILE) &&
!(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.");
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.");
if (!opt_logname) if (!opt_logname)
opt_logname= make_default_log_name(buff, ".log"); opt_logname= make_default_log_name(buff, ".log");
sys_var_general_log_path.value= my_strdup(opt_logname, MYF(0)); sys_var_general_log_path.value= my_strdup(opt_logname, MYF(0));