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

[Andrei Elkin]

 2749 Andrei Elkin	2009-01-26
      Bug #31240  	load data infile replication between (4.0 or 4.1) and 5.1 fails
            
      Overriding a default value of --secure-file-priv on pb.mtr to be $MYSQLTEST_VARDIR which 
      makes pb's mtr happy to execute the regression test for the bug.
modified:
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt

 2748 Andrei Elkin	2009-01-26
      Bug #31240  	load data infile replication between (4.0 or 4.1) and 5.1 fails
      
      Overriding a default value of --secure-file-priv on pb.mtr with a value allowable 
      the test to pass on pb.
modified:
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-26 14:49:42 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-26 15:24:43 +0000
@@ -1 +1 @@
---replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TEST_DIR
+--replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQLTEST_VARDIR