diff options
| author | df@pippilotta.erinye.com <> | 2007-05-30 17:11:08 +0200 |
|---|---|---|
| committer | df@pippilotta.erinye.com <> | 2007-05-30 17:11:08 +0200 |
| commit | dd9afd5d9807d49bd6cc7a289734be167fdb0511 (patch) | |
| tree | 0f4949cd7287be9df54d06498937e4f4666ced9f /mysql-test/mysql-test-run.pl | |
| parent | 870b38b808c7313ed00bb136acffade9df3ff6f8 (diff) | |
| parent | 20e13f8fb1204ccbbc759430cb0d12f30d08c3c8 (diff) | |
| download | mariadb-git-dd9afd5d9807d49bd6cc7a289734be167fdb0511.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
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 df39be15f05..27772ff0672 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3770,8 +3770,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) ) |