database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_loaddatalocal.result:
  Auto merged
This commit is contained in:
unknown
2006-10-05 18:45:40 +02:00
parent a574de91d9 9ba3b3f2ef
commit 03e129fa6d
2 changed files with 95 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -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,