1 files changed, 14 insertions, 3 deletions

diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 8cd9d21a087..e01b3e4e09c 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -5,6 +5,16 @@ connection slave;
 slave stop;
 reset master;
 reset slave;
+# We are going to read the slave's binlog which contains file_id (for some LOAD
+# DATA INFILE); to make it repeatable (not influenced by other tests), we need
+# to stop and start the slave, to be sure file_id will start from 1.
+#  This can be done with 'server_stop slave', but
+# this would require the manager, so most of the time the test will be skipped
+# :(
+# To workaround this, I (Guilhem) add a (empty) rpl_log-slave.opt (because when
+# mysql-test-run finds such a file it restarts the slave before doing the
+# test). That's not very elegant but I could find no better way, sorry.
+
 let $VERSION=`select version()`;
 
 connection master;
@@ -13,7 +23,8 @@ create table t1(n int not null auto_increment primary key);
 insert into t1 values (NULL);
 drop table t1;
 create table t1 (word char(20) not null);
-load data infile '../../std_data/words.dat' into table t1;
+load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+select count(*) from t1;
 drop table t1;
 --replace_result $VERSION VERSION
 show binlog events;
@@ -35,8 +46,8 @@ flush logs;
 # So, depending on a few milliseconds, we end up with 2 rotate events in the
 # relay log or one, which influences the output of SHOW SLAVE STATUS, making
 # it not predictable and causing random test failures.
-# To make it predictable, we do a useless update now, but which has the interest
-# of making the slave catch both rotate events.
+# To make it predictable, we do a useless update now, but which has the
+# interest of making the slave catch both rotate events.
 
 create table t5 (a int);
 drop table t5;