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 trift2.:/MySQL/M50/mysql-5.0

Browse Source 
into  trift2.:/MySQL/M50/push-5.0
This commit is contained in:
joerg@trift2.
2007-06-06 20:06:59 +02:00
parent d2fe24d1ef 86fbe0bdf0
commit d8c385c397
40 changed files with 316 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3776,8 +3776,7 @@ sub mysqld_arguments ($$$$) {
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
# Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt);
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
if ( $mysqld->{'type'} eq 'master' )
{
if (! ($opt_skip_master_binlog || $skip_binlog) )