Commit 7146466e authored by msvensson@shellback.(none)'s avatar msvensson@shellback.(none)

Merge 192.168.0.10:mysql/work/my51-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
parents f7bbcb71 21d6f823
......@@ -3595,6 +3595,11 @@ sub mysqld_arguments ($$$$$) {
# Force mysqld to use log files up until 5.1.6
mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
}
else
{
# Turn on logging, will be sent to tables
mtr_add_arg($args, "%s--log=", $prefix);
}
}
if ( $type eq 'slave' )
......@@ -3678,6 +3683,11 @@ sub mysqld_arguments ($$$$$) {
# Force mysqld to use log files up until 5.1.6
mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
}
else
{
# Turn on logging, will be sent to tables
mtr_add_arg($args, "%s--log=", $prefix);
}
} # end slave
......
--log --log-output=FILE
--log=$MYSQLTEST_VARDIR/log/master.log --log-output=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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment