diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-28 14:52:11 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-28 14:52:11 +0200 |
| commit | b631ea0188d5fb4768732eccb4c5024276b34c9b (patch) | |
| tree | b5ae91cc685e7d8ed845e9ecbcd94e7f8857ea7f /sql/sql_base.cc | |
| parent | 38da1f9853ec773e6c32cdf931b1fafef2736995 (diff) | |
| parent | 8c335b8a21056c83f771cef8b9d3b551682a50ba (diff) | |
| download | mariadb-git-b631ea0188d5fb4768732eccb4c5024276b34c9b.tar.gz | |
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
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 2c2c3f703b9..b913233806f 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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; |