diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 16:38:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 16:38:56 +0100 |
| commit | 508b3f3573e5a3dc47de463bcd431c3567f58a40 (patch) | |
| tree | 9ea311214c95556a354218fa6887381089430a52 /mysql-test/mysql-test-run.pl | |
| parent | eb6c1b2666f94dbf97c02b1038e33c671b89fbdc (diff) | |
| parent | 38ae09760b8fdfc93ffba0c8e9f8a84787bf71be (diff) | |
| download | mariadb-git-508b3f3573e5a3dc47de463bcd431c3567f58a40.tar.gz | |
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
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 355846d569b..a135964e322 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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' ) { |