Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mashka.mysql.fi:/home/my/mysql-4.0

2 files changed, 8 insertions, 4 deletions

diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 640e6f02103..2798d1a9fab 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -12,7 +12,10 @@ 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;
+count(*)
+69
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 8cd9d21a087..ad962b585a1 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -13,7 +13,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 +36,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;