Commit 66466ddf authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 8e5203ae 2aac04f9
...@@ -3596,6 +3596,11 @@ sub mysqld_arguments ($$$$$) { ...@@ -3596,6 +3596,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' )
...@@ -3679,6 +3684,11 @@ sub mysqld_arguments ($$$$$) { ...@@ -3679,6 +3684,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
......
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