bzr commit into mysql-5.1-bugteam branch (aelkin:2794) Bug#42451

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug42451-path_win_setup_fake_relay_log/ based on revid:vvaintroub@stripped

 2794 Andrei Elkin	2009-02-09
      Bug #42451 setup_fake_relay_log makes an incorrect path on windows
      
      Path composition for the relay log file that is stored into the relay index
      file was not correct for windows.
      mysql-test language does not provide primitives for portable path composition.
            
      Fixed with storing only the basename part of the external "fake" relay log into
      the relay index file.
      Safety of removal of the dirname part of the relaylog is provided by logics of
      `setup_fake_relay_log' that places the fake file into @@datadir directory.
modified:
  mysql-test/include/setup_fake_relay_log.inc
  mysql-test/suite/rpl/t/rpl_cross_version.test

per-file messages:
  mysql-test/include/setup_fake_relay_log.inc
    storing only the basename part of the external "fake" relay log into the relay
    log index.
  mysql-test/suite/rpl/t/rpl_cross_version.test
    restoring test for windows.
=== modified file 'mysql-test/include/setup_fake_relay_log.inc'
--- a/mysql-test/include/setup_fake_relay_log.inc	2009-01-27 11:33:30 +0000
+++ b/mysql-test/include/setup_fake_relay_log.inc	2009-02-09 13:17:04 +0000
@@ -69,9 +69,9 @@ let $_fake_relay_log_purge= `SELECT @@gl
 # Create relay log file.
 copy_file $fake_relay_log $_fake_relay_log;
 # Create relay log index.
---exec echo $_fake_relay_log > $_fake_relay_index
+--exec echo $_fake_filename-fake.000001 > $_fake_relay_index
 
 # Setup replication from existing relay log.
-eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_relay_log', RELAY_LOG_POS=4;
+eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4;
 
 --enable_query_log

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version.test'
--- a/mysql-test/suite/rpl/t/rpl_cross_version.test	2009-01-29 13:54:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version.test	2009-02-09 13:17:04 +0000
@@ -11,7 +11,7 @@
 #
 
 --source include/have_log_bin.inc
---source include/not_windows.inc
+
 #
 # Bug#31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
 #