bk commit into 5.0 tree (msvensson:1.2049)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2049 06/03/08 10:17:12 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
  into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137

  sql/sql_delete.cc
    1.172 06/03/08 10:17:03 msvensson@neptunus.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug17137/my50-bug17137/RESYNC

--- 1.171/sql/sql_delete.cc	2005-12-27 10:30:49 +01:00
+++ 1.172/sql/sql_delete.cc	2006-03-08 10:17:03 +01:00
@@ -813,6 +813,8 @@
     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