database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Fixed bug with FLUSH TABLES when using temporary tables

Browse Source
This commit is contained in:
monty@tik.mysql.fi
2001-03-23 21:16:57 +02:00
parent 5c497ccf2f
commit bdb822ef49
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_base.cc
View File

@@ -32,8 +32,6 @@
TABLE *unused_tables; /* Used by mysql_test */
HASH open_cache; /* Used by mysql_test */
static void reset_query_id_on_temp_tables(THD* thd);
static int open_unireg_entry(THD *thd,TABLE *entry,const char *db,
const char *name, const char *alias, bool locked);
static bool insert_fields(THD *thd,TABLE_LIST *tables, const char *table_name,
@@ -1314,13 +1312,6 @@ err:
DBUG_RETURN(1);
}
static void reset_query_id_on_temp_tables(THD* thd)
{
for(TABLE* tmp = thd->temporary_tables; tmp; tmp = tmp->next)
tmp->query_id = 0;
}
/*****************************************************************************
** open all tables in list
*****************************************************************************/
@@ -1348,13 +1339,13 @@ int open_tables(THD *thd,TABLE_LIST *start)
pthread_mutex_lock(&LOCK_open);
// if query_id is not reset, we will get an error
// re-opening a temp table
reset_query_id_on_temp_tables(thd);
thd->version=refresh_version;
TABLE **prev_table= &thd->open_tables;
bool found=0;
for (TABLE_LIST *tmp=start ; tmp ; tmp=tmp->next)
{
if (tmp->table)
/* Close normal (not temporary) changed tables */
if (tmp->table && ! tmp->table->tmp_table)
{
if (tmp->table->version != refresh_version ||
! tmp->table->db_stat)