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