database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Monty
2018-05-24 18:56:33 +03:00
committed by Vicențiu Ciorbaru
parent 72a8d29e00 bfed1bfe28
commit 494c981d23
40 changed files with 822 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/temporary_tables.cc
View File

@ -99,12 +99,14 @@ TABLE *THD::create_and_open_tmp_table(handlerton *hton,
@param db [IN] Database name
@param table_name [IN] Table name
@param state [IN] State of temp table to open
@return Success Pointer to first used table instance.
Failure NULL
*/
TABLE *THD::find_temporary_table(const char *db,
const char *table_name)
const char *table_name,
Temporary_table_state state)
{
DBUG_ENTER("THD::find_temporary_table");
@ -121,7 +123,7 @@ TABLE *THD::find_temporary_table(const char *db,
key_length= create_tmp_table_def_key(key, db, table_name);
locked= lock_temporary_tables();
table = find_temporary_table(key, key_length, TMP_TABLE_IN_USE);
table= find_temporary_table(key, key_length, state);
if (locked)
{
DBUG_ASSERT(m_tmp_tables_locked);
@ -140,16 +142,12 @@ TABLE *THD::find_temporary_table(const char *db,
@return Success Pointer to first used table instance.
Failure NULL
*/
TABLE *THD::find_temporary_table(const TABLE_LIST *tl)
TABLE *THD::find_temporary_table(const TABLE_LIST *tl,
Temporary_table_state state)
{
DBUG_ENTER("THD::find_temporary_table");
if (!has_temporary_tables())
{
DBUG_RETURN(NULL);
}
TABLE *table= find_temporary_table(tl->get_db_name(), tl->get_table_name());
TABLE *table= find_temporary_table(tl->get_db_name(), tl->get_table_name(),
state);
DBUG_RETURN(table);
}