bk commit into 4.1 tree (SergeyV:1.2397) BUG#12517

[sergeyv]

Below is the list of changes that have just been committed into a local
4.1 repository of sergeyv. When sergeyv 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.2397 05/08/26 17:48:55 SergeyV@selena. +1 -0
  Fixes bug #12517. Clear user variables for the last command in this thread.

  sql/sql_class.cc
    1.201 05/08/26 17:48:46 SergeyV@selena. +2 -0
    Clear user variables for the last command in this thread.

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/mysql-4.1-12517

--- 1.200/sql/sql_class.cc	2005-06-07 17:29:27 +04:00
+++ 1.201/sql/sql_class.cc	2005-08-26 17:48:46 +04:00
@@ -353,6 +353,8 @@
   mysql_ha_flush(this, (TABLE_LIST*) 0,
                  MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL);
   hash_free(&handler_tables_hash);
+  if (opt_bin_log)    
+    reset_dynamic(&thd->user_var_events);
   close_temporary_tables(this);
   my_free((char*) variables.time_format, MYF(MY_ALLOW_ZERO_PTR));
   my_free((char*) variables.date_format, MYF(MY_ALLOW_ZERO_PTR));