database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-31 10:28:59 +03:00
parent 0bf843cd13 6da14d7b4a
commit 4a0b56f604
141 changed files with 3170 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/temporary_tables.cc
View File

@ -1070,7 +1070,7 @@ TABLE *THD::find_temporary_table(const char *key, uint key_length,
case TMP_TABLE_ANY: found= true; break;
}
}
if (table && unlikely(table->m_needs_reopen))
if (table && unlikely(table->needs_reopen()))
{
share->all_tmp_tables.remove(table);
free_temporary_table(table);