bk commit into 5.1 tree (jmiller:1.2087)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2087 06/02/08 17:47:27 jmiller@stripped +2 -0
  updated results

  mysql-test/r/rpl_row_log_innodb.result
    1.2 06/02/08 17:47:10 jmiller@stripped +1 -1
    updated results

  mysql-test/r/rpl_ndb_log.result
    1.3 06/02/08 17:46:58 jmiller@stripped +1 -1
    updated results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.2/mysql-test/r/rpl_ndb_log.result	2006-02-08 12:54:26 +01:00
+++ 1.3/mysql-test/r/rpl_ndb_log.result	2006-02-08 17:46:58 +01:00
@@ -12,7 +12,7 @@
 insert into t1 values (NULL);
 drop table t1;
 create table t1 (word char(20) not null)ENGINE=NDB;
-load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
 count(*)
 69

--- 1.1/mysql-test/r/rpl_row_log_innodb.result	2006-02-06 23:06:27 +01:00
+++ 1.2/mysql-test/r/rpl_row_log_innodb.result	2006-02-08 17:47:10 +01:00
@@ -12,7 +12,7 @@
 insert into t1 values (NULL);
 drop table t1;
 create table t1 (word char(20) not null)ENGINE=InnoDB;
-load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
 count(*)
 69