merge from latest 5.5

This commit is contained in:
Guilhem Bichot 2011-04-26 13:26:41 +02:00
commit 85f6ec594a
3 changed files with 7 additions and 1 deletions

View file

@ -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)
{

View file

@ -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)
{

View file

@ -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)
{