diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-05-30 17:09:41 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-05-30 17:09:41 +0200 |
| commit | 001c930a9b11cb12ae0c542dd2229d48708d1f57 (patch) | |
| tree | 86186bedc9f67b63a1cd334f0fd98744f2a5015d /mysql-test/mysql-test-run.pl | |
| parent | 06297270880ca0f0023c66ca90291665ec3aacc2 (diff) | |
| parent | c317bc08cd32e6c910efa9efa7ba948b21eb2ee7 (diff) | |
| download | mariadb-git-001c930a9b11cb12ae0c542dd2229d48708d1f57.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f580213cda3..1ef6b1584c7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3740,8 +3740,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) ) |