Commit 508b3f35 authored by unknown's avatar unknown

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents eb6c1b26 38ae0976
......@@ -3616,7 +3616,7 @@ sub mysqld_arguments ($$$$$) {
}
# 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);
if ( $type eq 'master' )
{
......
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