diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:08:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:12:17 +0200 |
| commit | 44298e4dea39280187c587c6e776ce8d04e350de (patch) | |
| tree | 15f8bac3c985c4f07fd6af066439d046dbb13c35 /storage/innobase/dict/dict0dict.cc | |
| parent | dd68db0c17d674f1b64e70ff7ea9e3f4abe4ee3e (diff) | |
| parent | 9f7b8625e698da6b7eba7c26e765c66635571919 (diff) | |
| download | mariadb-git-44298e4dea39280187c587c6e776ce8d04e350de.tar.gz | |
Merge 10.2 into 10.3
Also, clean up the test innodb_gis.geometry a little further.
Diffstat (limited to 'storage/innobase/dict/dict0dict.cc')
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index eb7280b8673..a0f2b5f3972 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -1605,7 +1605,7 @@ dict_table_rename_in_cache( return(DB_OUT_OF_MEMORY); } - fil_delete_tablespace(table->space_id); + fil_delete_tablespace(table->space_id, !table->space); /* Delete any temp file hanging around. */ if (os_file_status(filepath, &exists, &ftype) |