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

After merge fixes

This commit is contained in:
unknown
2006-05-18 21:40:52 +02:00
parent 89257c9171
commit 495e1080e6
5 changed files with 18 additions and 25 deletions

View File

@ -1183,7 +1183,13 @@ static inline uint tmpkeyval(THD *thd, TABLE *table)
void close_temporary_tables(THD *thd)
{
TABLE *table;
TABLE *next,
*prev_table /* prev link is not maintained in TABLE's double-linked list */,
*table;
char *query= (gptr) 0, *end;
uint query_buf_size, max_names_len;
bool found_user_tables;
if (!thd->temporary_tables)
return;
@ -1283,7 +1289,7 @@ void close_temporary_tables(THD *thd)
table= next)
{
end_cur= strxmov(end_cur, "`", table->s->db.str, "`.`",
table->s->table_name.str, "`,", NullS);
table->s->table_name.str, "`,", NullS);
next= table->next;
close_temporary(table, 1, 1);
}
@ -1311,7 +1317,6 @@ void close_temporary_tables(THD *thd)
thd->temporary_tables=0;
}
/*
Find table in list.