bzr commit into mysql-6.0 branch (ramil:2854)

[Ramil Kalimullin]

#At file:///home/ram/mysql/mysql-6.0-5.1.29-rc/

 2854 Ramil Kalimullin	2008-10-07 [merge]
      Merge
modified:
  mysql-test/suite/rpl/t/disabled.def
  sql/log_event.cc

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-08-25 15:03:24 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-10-07 13:49:24 +0000
@@ -33,5 +33,4 @@ rpl_idempotency            : Bug#37767 2
 rpl_flushlog_loop          : Bug#37733 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
 rpl_locktrans_innodb       : Bug#37712 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
 rpl_temporary_errors       : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_temporary              : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
 rpl_flushlog_loop          : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2008-10-03 10:01:20 +0000
+++ b/sql/log_event.cc	2008-10-07 13:49:24 +0000
@@ -3354,6 +3354,17 @@ int Start_log_event_v3::do_apply_event(R
       close_temporary_tables(thd);
       cleanup_load_tmpdir();
     }
+    else
+    {
+      /*
+        Set all temporary tables thread references to the current thread
+        as they may point to the "old" SQL slave thread in case of its
+        restart.
+      */
+      TABLE *table;
+      for (table= thd->temporary_tables; table; table= table->next)
+        table->in_use= thd;
+    }
     break;
 
     /*