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

[Andrei Elkin]

 2750 Andrei Elkin	2009-01-27
      Bug #31240  	load data infile replication between (4.0 or 4.1) and 5.1 fails
      
      Fixing pb failures caused by mtr invokes the test with --tmpdir to which
      there are  sensitive operations in the test
      and setup_fake_relay_log.inc also needed --secure-file-priv for its own separate
      directory.
      
      Fixed with removing SELECT INTO OUTFILE and deploying --exec echo instead in the marco.
      The test's opt file should contain --secure-file-priv=$MYSQL_TEST_DIR as the test
      operations deal with files located in $MYSQL_TEST_DIR.
modified:
  mysql-test/include/setup_fake_relay_log.inc
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt

 2749 Chad MILLER	2009-01-26 [merge]
      Merge from 5.1 team tree.
modified:
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt
  mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
  mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result

=== modified file 'mysql-test/include/setup_fake_relay_log.inc'
--- a/mysql-test/include/setup_fake_relay_log.inc	2008-12-29 16:04:10 +0000
+++ b/mysql-test/include/setup_fake_relay_log.inc	2009-01-27 11:33:30 +0000
@@ -68,9 +68,8 @@ let $_fake_relay_log_purge= `SELECT @@gl
 
 # Create relay log file.
 copy_file $fake_relay_log $_fake_relay_log;
-
 # Create relay log index.
-eval SELECT '$_fake_relay_log' INTO OUTFILE '$_fake_relay_index';
+--exec echo $_fake_relay_log > $_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;

=== 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 15:24:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-27 11:33:30 +0000
@@ -1 +1 @@
---replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQLTEST_VARDIR
+--replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TMP_DIR