diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-29 22:51:25 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-29 22:51:25 +0100 |
commit | 66466ddfa66d4e360b854176735e5067c2de4fe0 (patch) | |
tree | 1f8b3c2803297d2a18b6a6b92f4438d47e72ec99 | |
parent | 8e5203aec8d03023edece5144748f7ad84fcdc5a (diff) | |
parent | 2aac04f9acabd33880348e849ac01fe34ac8b378 (diff) | |
download | mariadb-git-66466ddfa66d4e360b854176735e5067c2de4fe0.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0d2cd29f014..c81ebfd2aa3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3596,6 +3596,11 @@ sub mysqld_arguments ($$$$$) { # Force mysqld to use log files up until 5.1.6 mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); } + else + { + # Turn on logging, will be sent to tables + mtr_add_arg($args, "%s--log=", $prefix); + } } if ( $type eq 'slave' ) @@ -3679,6 +3684,11 @@ sub mysqld_arguments ($$$$$) { # Force mysqld to use log files up until 5.1.6 mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); } + else + { + # Turn on logging, will be sent to tables + mtr_add_arg($args, "%s--log=", $prefix); + } } # end slave |