summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2008-05-02 14:42:34 +0200
committerunknown <msvensson@pilot.mysql.com>2008-05-02 14:42:34 +0200
commitc4ddbe744c17c5f096ab0bf83270ce11ce15c2d5 (patch)
tree4e2c093faa36bebc3557327aab1cc08e7176112f /mysql-test/mysql-test-run.pl
parent02c00cf95d74a3fbfcf6907ab48759c3c4acd386 (diff)
parented83b0cd014f38d4979c71ef7dd93c2f95581118 (diff)
downloadmariadb-git-c4ddbe744c17c5f096ab0bf83270ce11ce15c2d5.tar.gz
Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build mysql-test/mysql-test-run.pl: Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 097a137e1b7..95fae4c1491 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1756,6 +1756,7 @@ sub mysql_upgrade_arguments()
mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}");
mtr_add_arg($args, "--datadir=$master->[0]->{'path_myddir'}");
mtr_add_arg($args, "--basedir=$glob_basedir");
+ mtr_add_arg($args, "--tmpdir=$opt_tmpdir");
if ( $opt_debug )
{