diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 08:50:54 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 08:50:54 +0100 |
commit | 389acf0a30415c745d2c241e1584b0b637ab95ed (patch) | |
tree | 8ea69501ccdb171458d1f82ba78c157258a90f71 /client | |
parent | 82adfe7b2a695fd9357e1f2f04415fd1691956b8 (diff) | |
download | mariadb-git-389acf0a30415c745d2c241e1584b0b637ab95ed.tar.gz |
Fix testcases:
1. main.merge fails with errno 13 in copy_file().
The reason for the error is that copy_file tries to create a file with the same name as recently deleted one,
and there is still an open handle for the deleted file.
To fix, use my_delete_allow_opened() for MTR's delete_file. On Windows, this renames file to unique name
prior to deletion, and prevents EACCES errors for files opened with FILE_SHARE_DELETE.
2. innodb_bug59641
generates warnings, after server was killed and restarted in the test case.
The warnings are about test_suppression table (needs to be repaired, as it that was written just prior to the crash)
Fixed by using FLUSH TABLES after populating warning suppression table.
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 84cbd314b4a..6a3b75f2410 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -3060,7 +3060,7 @@ void do_remove_file(struct st_command *command) ' '); DBUG_PRINT("info", ("removing file: %s", ds_filename.str)); - error= my_delete(ds_filename.str, MYF(disable_warnings ? 0 : MY_WME)) != 0; + error= my_delete_allow_opened(ds_filename.str, MYF(disable_warnings ? 0 : MY_WME)) != 0; handle_command_error(command, error, my_errno); dynstr_free(&ds_filename); DBUG_VOID_RETURN; |