summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-04 22:50:34 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-04 22:50:34 +0200
commitfe8d349ad99089cf349dae6cfc230af71cc05a7f (patch)
tree1c57d18da974e853707dfe8bcdb93191587c9d2a /mysql-test/mysql-test-run.pl
parent3f45e43c06705846f54264c1b28ab9c9b6e702ff (diff)
downloadmariadb-git-fe8d349ad99089cf349dae6cfc230af71cc05a7f.tar.gz
Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl7
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1305d9d59e6..108a97f03b4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3068,8 +3068,13 @@ sub mysqld_arguments ($$$$$) {
# Directory where slaves find the dumps generated by "load data"
# on the server. The path need to have constant length otherwise
# test results will vary, thus a relative path is used.
+ my $slave_load_path= "../tmp";
+ if ( $mysql_version_id < 50000 )
+ {
+ $slave_load_path= "../../var/tmp";
+ }
mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix,
- "../tmp");
+ $slave_load_path);
mtr_add_arg($args, "%s--socket=%s", $prefix,
$slave->[$idx]->{'path_sock'});
mtr_add_arg($args, "%s--set-variable=slave_net_timeout=10", $prefix);