bk commit into 5.1 tree (tomas:1.2540)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas 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@stripped, 2008-02-19 15:30:53+01:00, tomas@stripped +1 -0
  correct merge

  mysql-test/suite/rpl/t/rpl_loaddata_map.test@stripped, 2008-02-19 15:30:50+01:00, tomas@stripped +1 -1
    correct merge

diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_map.test b/mysql-test/suite/rpl/t/rpl_loaddata_map.test
--- a/mysql-test/suite/rpl/t/rpl_loaddata_map.test	2008-02-05 14:51:57 +01:00
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.test	2008-02-19 15:30:50 +01:00
@@ -35,7 +35,7 @@ eval load data infile '$MYSQLTEST_VARDIR
 select count(*) from t2 /* 5 000 */;
 
 # the binglog will show fragmented Append_block events
---let $binlog_start=106
+--let $binlog_start=107
 --replace_column 2 # 4 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>