diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-08 13:31:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-08 13:31:05 +0100 |
| commit | c80332c7b9ed2fd0ac86d579af53cdb0e855ec7e (patch) | |
| tree | 5209c5597ae2a4435c37415cbd44a48c16c371c8 /sql | |
| parent | a8331c7326dde37ae950ba33ad47257957fc581b (diff) | |
| parent | 9a293f36e4de273e8b507c2f0878dcf90b2cfcbc (diff) | |
| download | mariadb-git-c80332c7b9ed2fd0ac86d579af53cdb0e855ec7e.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index d8a8f28b92b..56dbd423b69 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -813,6 +813,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) strmov(path, table->s->path); *table_ptr= table->next; // Unlink table from list close_temporary(table,0); + if (thd->slave_thread) + --slave_open_temp_tables; *fn_ext(path)=0; // Remove the .frm extension ha_create_table(path, &create_info,1); // We don't need to call invalidate() because this table is not in cache |