database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-28 10:33:26 +03:00
parent 1630037959 742e1c727f
commit f79cebb4d0
355 changed files with 19740 additions and 8279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/temporary_tables.cc
View File

@@ -626,6 +626,10 @@ bool THD::drop_temporary_table(TABLE *table, bool *is_trans, bool delete_table)
DBUG_PRINT("tmptable", ("Dropping table: '%s'.'%s'",
table->s->db.str, table->s->table_name.str));
// close all handlers in case it is statement abort and some can be left
if (is_error())
table->file->ha_reset();
locked= lock_temporary_tables();
share= tmp_table_share(table);