diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-29 12:59:18 +0300 |
| commit | d62b0368ca53cc10b45b703bbeefcf0b674bd39d (patch) | |
| tree | e65926bf20605d24a87619553374a74e7ef1c2c8 /storage/innobase/fil/fil0fil.cc | |
| parent | 9d6d1221230e2acf9fac2ab6fe685c0a2a7845aa (diff) | |
| parent | 088b37b5eaa8c3198c7f8ea0358d15135833f6bb (diff) | |
| download | mariadb-git-d62b0368ca53cc10b45b703bbeefcf0b674bd39d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/fil/fil0fil.cc')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 64b4d6e7ea3..c19487df63d 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1967,10 +1967,11 @@ fil_make_filepath( if (path != NULL) { memcpy(full_name, path, path_len); len = path_len; - full_name[len] = '\0'; - os_normalize_path(full_name); } + full_name[len] = '\0'; + os_normalize_path(full_name); + if (trim_name) { /* Find the offset of the last DIR separator and set it to null in order to strip off the old basename from this path. */ |