Fix test cases to work with non-standard --vardir.

Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(


mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/r/mysqlbinlog_base64.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_load.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_LD_INFILE.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata2.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/loaddata.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/mysqlbinlog_base64.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_dd_dump.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_load.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_LD_INFILE.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata2.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata_m.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loadfile.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_load_table_from_master.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loadfile.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_stop_middle_update.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_drop_db.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_load_table_from_master.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_stop_middle_update.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/ndb_backup.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_bank.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_sync.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_bank.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_sync.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_NOW.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_func002.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp011.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_sp004.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/show_check.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_1.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_layout.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_dd_backuprestore.result:
  Fix test cases to work with non-standard --vardir.

mysql-test/extra/rpl_tests/rpl_row_001.test

@@ -2,7 +2,7 @@
 -- source include/have_binlog_format_row.inc
 
 CREATE TABLE t1 (word CHAR(20) NOT NULL);
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
 SELECT * FROM t1  ORDER BY word LIMIT 10;

mysql-test/extra/rpl_tests/rpl_row_UUID.test

@@ -56,8 +56,8 @@ SHOW CREATE TABLE test.t1;
 # then LOAD DATA INFILE in slave, and use a query to compare.
 # This would have the advantage that it would not assume
 # the system has a 'diff'
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql
 
 connection master;
 # Let's cleanup
@@ -72,7 +72,7 @@ DROP TABLE test.t2;
 # will be created. You will need to go to the mysql-test dir and diff
 # the files your self to see what is not matching :-)
 
---exec diff ./var/tmp/rpl_row_UUID_master.sql ./var/tmp/rpl_row_UUID_slave.sql;
+--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql;
 
 # Cleanup dump files.
 # Long-term "system rm" is not portable; we could live without

mysql-test/extra/rpl_tests/rpl_row_blob.test

@@ -176,10 +176,10 @@ connection master;
 --echo
 
 # Post test clean up section
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql
 
---exec diff ./var/tmp/rpl_row_blob_master.sql ./var/tmp/rpl_row_blob_slave.sql
+--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql
 
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;

mysql-test/extra/rpl_tests/rpl_row_charset.test

@@ -162,8 +162,8 @@ select hex(c1), hex(c2) from t1;
 
 connection master;
 # Let's have a look at generated SETs.
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-#--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var
+#--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
 drop table t1;
 sync_slave_with_master;
 

mysql-test/extra/rpl_tests/rpl_row_func003.test

@@ -77,8 +77,8 @@ SET AUTOCOMMIT=1;
 
 # time to dump the databases and so we can see if they match
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql
 
 # First lets cleanupi
 DROP FUNCTION test.f1;
@@ -88,9 +88,9 @@ DROP TABLE test.t1;
 # the test will show that the diff statement failed and no reject file
 # will be created. You will need to go to the mysql-test dir and diff
 # the files yourself to see what is not matching :-) File are located
-# in mysql-test/var/tmp
+# in $MYSQLTEST_VARDIR/tmp
 
-exec diff ./var/tmp/func003_master.sql ./var/tmp/func003_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
 
 
 # End of 5.0 test case

mysql-test/extra/rpl_tests/rpl_row_sp006.test

@@ -68,8 +68,8 @@ sync_slave_with_master;
 
 connection master;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/sp006_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/sp006_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/sp006_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/sp006_slave.sql
 
 
 DROP PROCEDURE IF EXISTS mysqltest1.p1;
@@ -81,9 +81,9 @@ DROP TABLE IF EXISTS mysqltest1.t2;
 # the test will show that the diff statement failed and not reject file
 # will be created. You will need to go to the mysql-test dir and diff
 # the files your self to see what is not matching :-) Failed test 
-# Dump files will be located in mysql-test/var/tmp.
+# Dump files will be located in $MYSQLTEST_VARDIR/tmp.
 
-exec diff ./var/tmp/sp006_master.sql ./var/tmp/sp006_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/sp006_master.sql $MYSQLTEST_VARDIR/tmp/sp006_slave.sql;
 
 sync_slave_with_master;