bzr commit into mysql-trunk branch (sven.sandberg:3769) Bug#11872422

[Sven Sandberg]

#At file:///home/sven/bzr/debug-max/trunk/ based on revid:dmitry.shulga@stripped

 3769 Sven Sandberg	2011-03-15 [merge]
      Merged BUG#11872422 from 5.5 to trunk.

    removed:
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
    modified:
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-03-15 10:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-03-15 15:16:34 +0000
@@ -1,5 +1,6 @@
 include/master-slave.inc
 [connection master]
+SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write';
 create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
 start transaction;
 insert into t1(b) values (1);
@@ -16,4 +17,5 @@ call mtr.add_suppression("Slave: Can't g
 call mtr.add_suppression("Slave SQL: Error .Can.t get stat of.* Error_code: 13");
 call mtr.add_suppression("Slave: File.* not found.*");
 call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
+SET @@GLOBAL.DEBUG = '';
 include/rpl_end.inc

=== removed file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt	2009-03-18 10:31:17 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-debug=d,remove_slave_load_file_before_write

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-03-15 10:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-03-15 15:16:34 +0000
@@ -1,12 +1,21 @@
-##########################################################################
+# ==== Purpose ====
+#
 # This test verifies if the slave fails gracefully when the temporary 
-# file used to load data is removed while it is about to be used it. 
+# file used to load data is removed while it is about to be used. 
 # Similar errors are caught if the temporary directory is removed.
 #
+# ==== Implementation ====
+#
 # Steps:
+#    0 - Set debug variable remove_slave_load_file_before_write. This
+#        causes the slave to remove the file.
 #    1 - Creates a table and populates it through "LOAD DATA INFILE".
 #    2 - Catches error.
-##########################################################################
+#
+# ==== References ====
+#
+# BUG#42861: Assigning invalid directories to --slave-load-tmpdir crashes the slave
+# BUG#11872422: rpl_slave_load_remove_tmpfile fails sporadically in pb2
 
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc
@@ -18,6 +27,11 @@
 ##########################################################################
 #                            Loading data
 ##########################################################################
+
+connection slave;
+--let $old_debug= `SELECT @@GLOBAL.DEBUG`
+SET @@GLOBAL.DEBUG = '+d,remove_slave_load_file_before_write';
+
 connection master;
 
 create table t1(a int not null auto_increment, b int, primary key(a)) engine=innodb;
@@ -32,6 +46,7 @@ commit;
 #                            Catch Error
 ##########################################################################
 connection slave;
+
 # windows and linux different error numbers here:
 # Windows:
 #  - Last_Errno     29 (File not found)
@@ -58,5 +73,8 @@ call mtr.add_suppression("Slave SQL: Err
 call mtr.add_suppression("Slave: File.* not found.*");
 call mtr.add_suppression("Slave SQL: Error .File.* not found.* Error_code: 29");
 --let $rpl_only_running_threads= 1
+
+eval SET @@GLOBAL.DEBUG = '$old_debug';
+
 --source include/rpl_end.inc
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).