bzr commit into mysql-5.5 branch (sven.sandberg:3369) Bug#11872422

[Sven Sandberg]

#At file:///home/sven/bzr/debug-max/5.5/ based on revid:magne.mahre@stripped

 3369 Sven Sandberg	2011-03-15
      BUG#11872422: rpl_slave_load_remove_tmpfile fails sporadically in pb2
      Problem: the test failed because errors were found in the error log.
      The test case contains suppressions for an old version of the error message,
      but the format of the error message has changed without updating the suppression.
      Fix: Update the suppression. Also small fixes to improve the test.
     @ mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
        update result file
     @ mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile-slave.opt
        Use variables instead of .opt files to avoid server restarts.
     @ mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
        1. To fix the bug, we update the regular expression in mtr.add_suppression
           so that it matches the real error text.
        2. Use wait_for_slave_sql_error.inc when we wait for an error.
           This makes the test easier to understand and will produce better
           debug info if the test fails.
        3. Use server variables instead of command line options to set
           the @@GLOBAL.DEBUG variable. This avoids server restarts when
           running the test suite.
        4. Clarify the comment at the top of the file and add bug reference.

    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-02-24 14:48:35 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2011-03-15 12:32:02 +0000
@@ -1,12 +1,13 @@
 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);
 insert into t1(b) values (2);
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 commit;
-include/wait_for_slave_sql_to_stop.inc
+include/wait_for_slave_sql_error.inc [errno=29, 13]
 drop table t1;
 include/sync_slave_io_with_master.inc
 include/stop_slave_io.inc
@@ -14,5 +15,6 @@ RESET SLAVE;
 drop table t1;
 call mtr.add_suppression("Slave: Can't get stat of .*");
 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.*");
+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-02-24 14:48:35 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-03-15 12:32:02 +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,19 +46,14 @@ commit;
 #                            Catch Error
 ##########################################################################
 connection slave;
-source include/wait_for_slave_sql_to_stop.inc;
 
---let $error= query_get_value(SHOW SLAVE STATUS, Last_Errno, 1)
 # windows and linux different error numbers here:
 # Windows:
 #  - Last_Errno     29 (File not found)
 # Unix like OS: 
 #  - Last_Errno      13 (Can't stat file)
---let $assertion= `SELECT $error=29 OR $error=13`
-if (!$assertion)
-{
-  --echo UNEXPECTED ERROR NUMBER: $error
-}
+--let $slave_sql_errno= 29, 13
+--source include/wait_for_slave_sql_error.inc
 
 ##########################################################################
 #                             Clean up
@@ -61,7 +70,10 @@ drop table t1;
 
 call mtr.add_suppression("Slave: Can't get stat of .*");
 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.*");
 --let $rpl_only_running_threads= 1
+
+eval SET @@GLOBAL.DEBUG = '$old_debug';
+
 --source include/rpl_end.inc
 


Attachment: [text/bzr-bundle] bzr/[e-mail]