bk commit into 5.1 tree (aelkin:1.2308)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of aelkin. When aelkin 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.2308 06/04/07 21:15:14 aelkin@stripped +3 -0
  Merge dl145j:/tmp/5.0.21-bug17284-temp_table
  into  dl145k.mysql.com:/users/aelkin/CLONES/mysql-5.1-release

  mysql-test/t/rpl_temporary.test
    1.19 06/04/07 21:12:49 aelkin@stripped +1 -1
    e
    manual merge

  sql/sql_repl.cc
    1.152 06/04/07 21:07:34 aelkin@stripped +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.22 06/04/07 21:07:32 aelkin@stripped +1 -1
    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:	aelkin
# Host:	dl145k.mysql.com
# Root:	/users/aelkin/CLONES/mysql-5.1-release/RESYNC

--- 1.151/sql/sql_repl.cc	2006-03-23 14:51:26 +01:00
+++ 1.152/sql/sql_repl.cc	2006-04-07 21:07:34 +02:00
@@ -464,6 +464,12 @@
            (rli->group_master_log_pos)
          */
          int4store((char*) packet->ptr()+LOG_POS_OFFSET+1, 0);
+         /*
+           if reconnect master sends FD event with `created' as 0
+           to avoid destroying temp tables.
+          */
+         int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+
+                   ST_CREATED_OFFSET+1, (ulong) 0);
          /* send it */
          if (my_net_write(net, (char*)packet->ptr(), packet->length()))
          {

--- 1.21/mysql-test/r/rpl_temporary.result	2006-02-08 17:09:26 +01:00
+++ 1.22/mysql-test/r/rpl_temporary.result	2006-04-07 21:07:32 +02:00
@@ -74,3 +74,17 @@
 7
 drop table t1,t2;
 create temporary table t3 (f int);
+create temporary table t4 (f int);
+create table t5 (f int);
+drop table if exists t999;
+create temporary table t999 (f int);
+LOAD DATA INFILE "./var/tmp/bl_dump_thread_id" into table t999;
+drop table t999;
+insert into t4 values (1);
+kill `select id from information_schema.processlist where command='Binlog Dump'`;
+insert into t5 select * from t4;
+select * from t5 /* must be 1 after reconnection */;
+f
+1
+drop temporary table t4;
+drop table t5;

--- 1.18/mysql-test/t/rpl_temporary.test	2006-02-08 17:09:12 +01:00
+++ 1.19/mysql-test/t/rpl_temporary.test	2006-04-07 21:12:49 +02:00
@@ -131,4 +131,30 @@
 create temporary table t3 (f int);
 sync_with_master;
 
+#
+# Bug#17284 erroneous temp table cleanup on slave
+#
+
+connection master;
+create temporary table t4 (f int);
+create table t5 (f int);
+sync_with_master;
+# find dumper's $id
+source include/get_binlog_dump_thread_id.inc;
+insert into t4 values (1);
+# a hint how to do that in 5.1
+--replace_result $id "`select id from information_schema.processlist where
command='Binlog Dump'`"
+eval kill $id; # to stimulate reconnection by slave w/o timeout
+insert into t5 select * from t4;
+save_master_pos;
+
+connection slave;
+sync_with_master;
+select * from t5 /* must be 1 after reconnection */;
+
+connection master;
+drop temporary table t4;
+drop table t5;
+
 # The server will now close done
+# End of tests