bk commit into 4.1 tree (SergeyV:1.2390) 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.2390 05/08/30 17:22:19 SergeyV@selena. +3 -0
  Fixes bug #12517. Clear user variables and replication events before 
  closing temp tables in thread cleanup.

  sql/sql_class.cc
    1.201 05/08/30 17:22:11 SergeyV@selena. +2 -2
    Clear user variables and replication events before
    closing temp tables in thread cleanup.

  mysql-test/t/connect.test
    1.12 05/08/30 17:22:10 SergeyV@selena. +18 -0
    added test of bug #12517

  mysql-test/r/connect.result
    1.11 05/08/30 17:22:09 SergeyV@selena. +16 -0
    added results for test of bug #12517

# 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/#12517-mysql-4.1

--- 1.200/sql/sql_class.cc	2005-06-07 17:29:27 +04:00
+++ 1.201/sql/sql_class.cc	2005-08-30 17:22:11 +04:00
@@ -353,12 +353,12 @@
   mysql_ha_flush(this, (TABLE_LIST*) 0,
                  MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL);
   hash_free(&handler_tables_hash);
+  delete_dynamic(&user_var_events);
+  hash_free(&user_vars);
   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));
   my_free((char*) variables.datetime_format, MYF(MY_ALLOW_ZERO_PTR));
-  delete_dynamic(&user_var_events);
-  hash_free(&user_vars);
   if (global_read_lock)
     unlock_global_read_lock(this);
   if (ull)

--- 1.10/mysql-test/r/connect.result	2004-08-26 19:26:33 +04:00
+++ 1.11/mysql-test/r/connect.result	2005-08-30 17:22:09 +04:00
@@ -65,3 +65,19 @@
 Tables_in_test
 delete from mysql.user where user=_binary"test";
 flush privileges;
+use test;
+drop table if exists t1;
+Warnings:
+Note	1051	Unknown table 't1'
+create table t1 (id integer not null auto_increment primary key);
+drop table if exists t2;
+Warnings:
+Note	1051	Unknown table 't2'
+create temporary table t2(id integer not null auto_increment primary key);
+set @id := 1;
+delete from t1 where id like @id;
+use test;
+drop table if exists t2;
+Warnings:
+Note	1051	Unknown table 't2'
+drop table if exists t1;

--- 1.11/mysql-test/t/connect.test	2005-07-28 04:21:39 +04:00
+++ 1.12/mysql-test/t/connect.test	2005-08-30 17:22:10 +04:00
@@ -77,4 +77,22 @@
 delete from mysql.user where user=_binary"test";
 flush privileges;
 
+# Test for bug #12517.
+connect (con2,localhost,root,,test);
+connection con2;
+use test;
+drop table if exists t1;
+create table t1 (id integer not null auto_increment primary key);
+drop table if exists t2;
+create temporary table t2(id integer not null auto_increment primary key);
+set @id := 1;
+delete from t1 where id like @id;
+disconnect con2;
+sleep 5;
+connect (con1,localhost,root,,test);
+connection con1;
+use test;
+drop table if exists t2;
+drop table if exists t1;
+
 # End of 4.1 tests