database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

10
mysql-test/mysql-test-run.pl
View File

@ -3595,6 +3595,11 @@ sub mysqld_arguments ($$$$$) {
# Force mysqld to use log files up until 5.1.6 # Force mysqld to use log files up until 5.1.6
mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); 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' ) if ( $type eq 'slave' )
@ -3678,6 +3683,11 @@ sub mysqld_arguments ($$$$$) {
# Force mysqld to use log files up until 5.1.6 # Force mysqld to use log files up until 5.1.6
mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); 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 } # end slave

2
mysql-test/t/mysql_client_test-master.opt
View File

@ -1 +1 @@
--log --log-output=FILE --log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE

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)) !(log_output_options & LOG_NONE))
sql_print_warning("Although a path was specified for the " sql_print_warning("Although a path was specified for the "
"--log option, log tables are used. " "--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) if (opt_slow_log && opt_slow_logname && !(log_output_options & LOG_FILE)
&& !(log_output_options & LOG_NONE)) && !(log_output_options & LOG_NONE))
sql_print_warning("Although a path was specified for the " sql_print_warning("Although a path was specified for the "
"--log-slow-queries option, log tables are used. " "--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) if (!opt_logname)
opt_logname= make_default_log_name(buff, ".log"); opt_logname= make_default_log_name(buff, ".log");