bk commit into 4.1 tree (bell:1.2000)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2000 04/09/05 10:57:26 bell@stripped +1 -0
  memory leak fixed

  sql/sql_derived.cc
    1.74 04/09/05 10:57:23 bell@stripped +5 -3
    memory leak fixed

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-4.1

--- 1.73/sql/sql_derived.cc	Sat Aug 21 01:02:42 2004
+++ 1.74/sql/sql_derived.cc	Sun Sep  5 10:57:23 2004
@@ -222,10 +222,12 @@
       table->next= thd->derived_tables;
       thd->derived_tables= table;
     }
+  }
+  else
+    free_tmp_table(thd, table);
 
 exit:
-    delete derived_result;
-    lex->current_select= save_current_select;
-  }
+  delete derived_result;
+  lex->current_select= save_current_select;
   DBUG_RETURN(res);
 }