mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 10:45:30 +02:00
merge
Docs/manual.texi: Auto merged mysql-test/t/rpl000013.test: Auto merged mysql-test/t/rpl000016.test: Auto merged extra/resolveip.c: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged
This commit is contained in:
commit
b631ea0188
10 changed files with 88 additions and 62 deletions
|
|
@ -533,10 +533,10 @@ void close_temporary_tables(THD *thd)
|
|||
if (query) // we might be out of memory, but this is not fatal
|
||||
{
|
||||
// skip temporary tables not created directly by the user
|
||||
if (table->table_name[0] != '#')
|
||||
if (table->real_name[0] != '#')
|
||||
{
|
||||
end = strxmov(end,table->table_cache_key,".",
|
||||
table->table_name,",", NullS);
|
||||
table->real_name,",", NullS);
|
||||
// here we assume table_cache_key always starts
|
||||
// with \0 terminated db name
|
||||
found_user_tables = 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue