diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-29 22:17:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-29 22:17:37 +0300 |
| commit | db0782243c3cae80491b7483c6fb11ba00520be7 (patch) | |
| tree | d55765c5614ff8e9ab5eeaf733a4a2a114e6a5b3 | |
| parent | 54e2e70194b9374543fdfc81a47d583e34771fac (diff) | |
| download | mariadb-git-db0782243c3cae80491b7483c6fb11ba00520be7.tar.gz | |
MDEV-25524 fixup for Windows
In commit 54e2e70194b9374543fdfc81a47d583e34771fac
we relaxed a debug assertion in the POSIX version of
os_file_rename_func() only. Let us relax it also on Windows,
so that the test innodb.truncate_crash will pass.
| -rw-r--r-- | storage/innobase/os/os0file.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 2e5a15498d8..9800c445cfb 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -2831,7 +2831,8 @@ os_file_rename_func( /* New path must not exist. */ ut_ad(os_file_status(newpath, &exists, &type)); - ut_ad(!exists); + /* MDEV-25506 FIXME: Remove the strstr() */ + ut_ad(!exists || strstr(oldpath, "/" TEMP_FILE_PREFIX_INNODB)); /* Old path must exist. */ ut_ad(os_file_status(oldpath, &exists, &type)); |