diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-01 19:10:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-01 19:10:07 +0100 |
| commit | 0e6a060c2df76ab7a9a3fde2de6eaef60620b989 (patch) | |
| tree | daf8c2086f70af8fd2f407e5cfbb7e88d3d160b9 /mysql-test/mysql-test-run.pl | |
| parent | 4a9edcc32c7addea01e7e5b80e452939e7de07c7 (diff) | |
| parent | 115a299ff3ce27b85d62ebc1b836c77e6fa4b5de (diff) | |
| download | mariadb-git-0e6a060c2df76ab7a9a3fde2de6eaef60620b989.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
sql/mysqld.cc:
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 4d385ddee66..9f1ab7a73d0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3793,7 +3793,7 @@ sub mysqld_arguments ($$$$$) { if ( $mysql_version_id <= 50106 ) { # Force mysqld to use log files up until 5.1.6 - mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'}); + mtr_add_arg($args, "%s--log=%s", $prefix, $slave->[0]->{'path_mylog'}); } else { |