mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh
This commit is contained in:
parent
914f2bbc2a
commit
6ac9c43e51
1 changed files with 6 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue