bzr push into mysql-5.1-bugteam branch (aelkin:2750 to 2751) Bug#31240

[Andrei Elkin]

 2751 Andrei Elkin	2009-01-23
      Bug #31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
      
      an additional changeset to remove printing a path name.
modified:
  mysql-test/suite/rpl/r/rpl_cross_version.result
  mysql-test/suite/rpl/t/rpl_cross_version.test

 2750 Andrei Elkin	2009-01-23 [merge]
      merge from 5.1-bt to a local tree.
modified:
  mysql-test/include/rpl_events.inc
  mysql-test/r/myisampack.result
  mysql-test/r/query_cache_notembedded.result
  mysql-test/suite/rpl/r/rpl_events.result
  mysql-test/suite/rpl/t/rpl_events.test
  mysql-test/t/myisampack.test
  mysql-test/t/query_cache_notembedded.test
  sql/sql_cache.cc

=== modified file 'mysql-test/suite/rpl/r/rpl_cross_version.result'
--- a/mysql-test/suite/rpl/r/rpl_cross_version.result	2009-01-22 14:55:14 +0000
+++ b/mysql-test/suite/rpl/r/rpl_cross_version.result	2009-01-23 17:15:27 +0000
@@ -2,7 +2,7 @@
 Setting up fake replication from
MYSQL_TEST_DIR/suite/binlog/std_data/binlog_old_version_4_1.000001
 ==== Test ====
 start slave sql_thread;
-==== a prove that the
/home/andrei/MySQL/BZR/FIXES/bug31240-ldi_41_2_51/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
has been processed successfully ====
+==== a prove that the fake has been processed successfully ====
 SELECT COUNT(*) - 17920 as zero FROM t3;
 zero
 0

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version.test'
--- a/mysql-test/suite/rpl/t/rpl_cross_version.test	2009-01-22 14:55:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version.test	2009-01-23 17:15:27 +0000
@@ -27,7 +27,7 @@ start slave sql_thread;
 # end_log_pos of the last event of the relay log
 --let $slave_param_value = 149436
 --source include/wait_for_slave_param.inc
---echo ==== a prove that the $fake_relay_log has been processed successfully ====
+--echo ==== a prove that the fake has been processed successfully ====
 SELECT COUNT(*) - 17920 as zero FROM t3;
 
 --echo ==== Clean up ====