diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-08 16:21:04 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-08 16:21:04 +0200 |
| commit | df3c783c25a023ec95b0267d1327928eb5fa76f8 (patch) | |
| tree | 41431e1d11d397709a6a8acd2d01b014b6bb1741 /mysql-test/mysql-test-run.pl | |
| parent | 1632c3bb739bcddc2679e4c18f6864a1cd0d67b1 (diff) | |
| parent | 6bb66c75daf9366ca8e376b8104eb8d0084a2ce3 (diff) | |
| download | mariadb-git-df3c783c25a023ec95b0267d1327928eb5fa76f8.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3b87957f9a7..e36c978ee02 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -912,6 +912,9 @@ sub command_line_setup () { $opt_skip_ndbcluster= 1; # Turn off use of NDB cluster $opt_skip_ssl= 1; # Turn off use of SSL + # Turn off use of bin log + push(@opt_extra_mysqld_opt, "--skip-log-bin"); + if ( $opt_extern ) { mtr_error("Can't use --extern with --embedded-server"); |