merge from latest 5.5
This commit is contained in:
commit
85f6ec594a
@ -37,7 +37,7 @@ if ($do_file_tests)
|
||||
eval SET @aux = load_file('$ls_file');
|
||||
|
||||
# clean up
|
||||
remove_file $ls_file;
|
||||
--remove_file $ls_file
|
||||
}
|
||||
if (!$do_file_tests)
|
||||
{
|
||||
|
@ -45,6 +45,9 @@ if ($do_file_tests)
|
||||
--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
|
||||
}
|
||||
eval SET @aux = load_file('$ls_file');
|
||||
|
||||
# clean up
|
||||
--remove_file $ls_file
|
||||
}
|
||||
if (!$do_file_tests)
|
||||
{
|
||||
|
@ -43,6 +43,9 @@ if ($do_file_tests)
|
||||
--list_files_append_file $ls_file $MYSQLTEST_VARDIR/mysql-test-idx-dir t1*
|
||||
}
|
||||
eval SET @aux = load_file('$ls_file');
|
||||
|
||||
# clean up
|
||||
--remove_file $ls_file
|
||||
}
|
||||
if (!$do_file_tests)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user