diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-16 17:51:49 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-17 17:03:24 +1100 |
| commit | b73d85277939e3edff90e1ff927218a541a2c136 (patch) | |
| tree | 89d82c9686e5f28689ef9546dbe5fe8b47009ce4 /sql/temporary_tables.cc | |
| parent | 73fee39ea62037780c59161507e89dd76c10b7a3 (diff) | |
| parent | 069139a549a62f26d566c1aea2a49c13e9e8a654 (diff) | |
| download | mariadb-git-b73d85277939e3edff90e1ff927218a541a2c136.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'sql/temporary_tables.cc')
| -rw-r--r-- | sql/temporary_tables.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc index 981958abdb2..f3264a4c809 100644 --- a/sql/temporary_tables.cc +++ b/sql/temporary_tables.cc @@ -697,9 +697,7 @@ bool THD::rm_temporary_table(handlerton *base, const char *path) char frm_path[FN_REFLEN + 1]; strxnmov(frm_path, sizeof(frm_path) - 1, path, reg_ext, NullS); - if (mysql_file_delete(key_file_frm, frm_path, - MYF(MY_WME | MY_IGNORE_ENOENT))) - error= true; + if (base->drop_table(base, path) > 0) { error= true; @@ -707,6 +705,10 @@ bool THD::rm_temporary_table(handlerton *base, const char *path) path, my_errno); } + if (mysql_file_delete(key_file_frm, frm_path, + MYF(MY_WME | MY_IGNORE_ENOENT))) + error= true; + DBUG_RETURN(error); } |