Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools

into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
b7d7f250 · msvensson@neptunus.(none) · 9e03a340 · ab862ca2 · b7d7f250 · b7d7f250
Commit b7d7f250 authored Oct 05, 2006 by msvensson@neptunus.(none)
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 95 additions and 90 deletions

client/mysqltest.c client/mysqltest.c +95 -86

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +0 -4

No files found.
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3153,10 +3153,6 @@ sub mysqld_arguments ($$$$$) {
    # 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,
                $slave_load_path);
    mtr_add_arg($args, "%s--socket=%s", $prefix,