MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:knielsen Date:February 21 2006 5:00pm
Subject:bk commit into 5.1 tree (knielsen:1.2152)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2152 06/02/21 17:59:52 knielsen@stripped +46 -0
  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/rpl_row_sp011.test
    1.3 06/02/21 17:55:29 knielsen@stripped +6 -6
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/ndb_dd_backuprestore.result
    1.3 06/02/21 17:55:29 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/include/partition_layout.inc
    1.2 06/02/21 17:55:29 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/include/partition_1.inc
    1.4 06/02/21 17:55:29 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/include/ndb_backup.inc
    1.3 06/02/21 17:55:29 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_sp006.test
    1.2 06/02/21 17:55:29 knielsen@stripped +4 -4
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_func003.test
    1.2 06/02/21 17:55:29 knielsen@stripped +4 -4
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_charset.test
    1.2 06/02/21 17:55:29 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_blob.test
    1.5 06/02/21 17:55:29 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_UUID.test
    1.3 06/02/21 17:55:29 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/show_check.test
    1.63 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_sp004.test
    1.3 06/02/21 17:55:28 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_trig003.test
    1.2 06/02/21 17:55:28 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_trig001.test
    1.4 06/02/21 17:55:28 knielsen@stripped +4 -4
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_stop_middle_update.test
    1.2 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_sp001.test
    1.4 06/02/21 17:55:28 knielsen@stripped +6 -6
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_func002.test
    1.3 06/02/21 17:55:28 knielsen@stripped +3 -3
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_row_NOW.test
    1.2 06/02/21 17:55:28 knielsen@stripped +6 -6
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_ndb_sync.test
    1.6 06/02/21 17:55:28 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_ndb_bank.test
    1.4 06/02/21 17:55:28 knielsen@stripped +5 -5
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_drop_db.test
    1.9 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_row_stop_middle_update.result
    1.2 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_row_loaddata_m.result
    1.2 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_row_001.result
    1.3 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_ndb_sync.result
    1.5 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_ndb_row_001.result
    1.2 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_ndb_bank.result
    1.2 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/extra/rpl_tests/rpl_row_001.test
    1.3 06/02/21 17:55:28 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_loadfile.test
    1.5 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_loaddata_m.test
    1.20 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_loaddata2.test
    1.4 06/02/21 17:55:27 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_load_table_from_master.test
    1.8 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/rpl_LD_INFILE.test
    1.4 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/ndb_load.test
    1.2 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/ndb_dd_dump.test
    1.3 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_loadfile.result
    1.3 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_loaddata_m.result
    1.21 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_loaddata2.result
    1.4 06/02/21 17:55:27 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_load_table_from_master.result
    1.18 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/rpl_LD_INFILE.result
    1.3 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/ndb_load.result
    1.2 06/02/21 17:55:27 knielsen@stripped +2 -2
    Fix test cases to work with non-standard --vardir.

  mysql-test/r/mysqlbinlog_base64.result
    1.2 06/02/21 17:55:27 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/mysqlbinlog_base64.test
    1.2 06/02/21 17:55:26 knielsen@stripped +4 -4
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/loaddata.test
    1.18 06/02/21 17:55:26 knielsen@stripped +1 -1
    Fix test cases to work with non-standard --vardir.

  mysql-test/t/binlog_stm_mix_innodb_myisam.opt
    1.3 06/02/21 17:51:19 knielsen@stripped +0 -0
    Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam.opt

  mysql-test/t/binlog_row_mix_innodb_myisam.opt
    1.3 06/02/21 17:51:06 knielsen@stripped +0 -0
    bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam.opt

  mysql-test/t/binlog_row_mix_innodb_myisam.opt
    1.2 05/09/15 17:04:44 monty@stripped +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/t/binlog_row_mix_innodb_myisam.opt
    1.1 04/11/04 19:19:20 guilhem@stripped +1 -0

  mysql-test/t/binlog_row_mix_innodb_myisam.opt
    1.0 04/11/04 19:19:20 guilhem@stripped +0 -0
    BitKeeper file /home/mysql_src/mysql-4.0/mysql-test/t/mix_innodb_myisam_binlog-master.opt

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-varfix

--- 1.20/mysql-test/r/rpl_loaddata_m.result	2006-02-07 20:54:34 +01:00
+++ 1.21/mysql-test/r/rpl_loaddata_m.result	2006-02-21 17:55:27 +01:00
@@ -7,14 +7,14 @@
 drop database if exists mysqltest;
 USE test;
 CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1;
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 2
 CREATE DATABASE mysqltest;
 USE mysqltest;
 CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
 SELECT COUNT(*) FROM mysqltest.t1;
 COUNT(*)
 2
--- New file ---
+++ mysql-test/t/binlog_row_mix_innodb_myisam.opt	04/11/04 19:19:20
--loose-innodb_lock_wait_timeout=2


--- 1.19/mysql-test/t/rpl_loaddata_m.test	2006-02-13 19:02:18 +01:00
+++ 1.20/mysql-test/t/rpl_loaddata_m.test	2006-02-21 17:55:27 +01:00
@@ -17,14 +17,14 @@
 # 'test' database should be ignored by the slave
 USE test;
 CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1;
 SELECT COUNT(*) FROM test.t1;
 
 # 'mysqltest' database should NOT be ignored by the slave
 CREATE DATABASE mysqltest;
 USE mysqltest;
 CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
 SELECT COUNT(*) FROM mysqltest.t1;
 
 # Now lets check the slave to see what we have :-)

--- 1.4/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-02-20 17:19:32 +01:00
+++ 1.5/mysql-test/extra/rpl_tests/rpl_row_blob.test	2006-02-21 17:55:29 +01:00
@@ -176,10 +176,10 @@
 --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;

--- 1.2/mysql-test/include/ndb_backup.inc	2006-02-16 16:33:26 +01:00
+++ 1.3/mysql-test/include/ndb_backup.inc	2006-02-21 17:55:29 +01:00
@@ -6,13 +6,13 @@
 
 # there is no neat way to find the backupid, this is a hack to find it...
 
---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat
+--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
 
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 
 DELETE FROM test.backup_info;
 
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 
 --replace_column 1 <the_backup_id>
 

--- 1.2/mysql-test/r/ndb_dd_backuprestore.result	2006-02-21 09:25:43 +01:00
+++ 1.3/mysql-test/r/ndb_dd_backuprestore.result	2006-02-21 17:55:29 +01:00
@@ -29,7 +29,7 @@
 5	Sweden	496	1
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM test.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM test.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>
@@ -97,7 +97,7 @@
 16384
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM test.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM test.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>
@@ -310,7 +310,7 @@
 246	TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU	8	1
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM test.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM test.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>

--- 1.1/mysql-test/r/rpl_ndb_row_001.result	2006-02-15 21:36:29 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_row_001.result	2006-02-21 17:55:28 +01:00
@@ -5,7 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 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;
 LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
 SELECT * FROM t1  ORDER BY word LIMIT 10;
 word

--- 1.7/mysql-test/t/rpl_load_table_from_master.test	2006-02-07 14:49:55 +01:00
+++ 1.8/mysql-test/t/rpl_load_table_from_master.test	2006-02-21 17:55:27 +01:00
@@ -71,9 +71,9 @@
 connection master;
 set SQL_LOG_BIN=0;
 create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
-load data infile '../../std_data/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
 create table t2 (word char(20) not null)ENGINE=MyISAM;
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
 connection slave;
 load table t1 from master;

--- 1.2/mysql-test/extra/rpl_tests/rpl_row_001.test	2006-02-08 02:27:29 +01:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_row_001.test	2006-02-21 17:55:28 +01:00
@@ -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;

--- 1.2/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2006-02-10 10:18:36 +01:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2006-02-21 17:55:29 +01:00
@@ -56,8 +56,8 @@
 # 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 @@
 # 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

--- 1.1/mysql-test/extra/rpl_tests/rpl_row_charset.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_charset.test	2006-02-21 17:55:29 +01:00
@@ -162,8 +162,8 @@
 
 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;
 

--- 1.1/mysql-test/extra/rpl_tests/rpl_row_func003.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_func003.test	2006-02-21 17:55:29 +01:00
@@ -77,8 +77,8 @@
 
 # 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 @@
 # 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

--- 1.1/mysql-test/extra/rpl_tests/rpl_row_sp006.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_sp006.test	2006-02-21 17:55:29 +01:00
@@ -68,8 +68,8 @@
 
 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 @@
 # 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;
 

--- 1.1/mysql-test/r/mysqlbinlog_base64.result	2005-12-22 06:34:49 +01:00
+++ 1.2/mysql-test/r/mysqlbinlog_base64.result	2006-02-21 17:55:27 +01:00
@@ -5,7 +5,7 @@
 update t1 set a=a+2 where a=2;
 update t1 set a=a+2 where a=3;
 create table t2 (word varchar(20));
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 drop table t1;
 drop table t2;
 select * from t1;

--- 1.2/mysql-test/r/rpl_LD_INFILE.result	2006-02-02 22:41:34 +01:00
+++ 1.3/mysql-test/r/rpl_LD_INFILE.result	2006-02-21 17:55:27 +01:00
@@ -6,10 +6,10 @@
 start slave;
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
-LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE a = 'abashed';
 DELETE FROM test.t1;
-LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
 SELECT * FROM test.t1 ORDER BY a DESC;
 a
 aberration

--- 1.3/mysql-test/r/rpl_loaddata2.result	2006-02-13 19:02:03 +01:00
+++ 1.4/mysql-test/r/rpl_loaddata2.result	2006-02-21 17:55:27 +01:00
@@ -5,7 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 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;
 SELECT * FROM t1 ORDER BY word;
 word
 Aarhus

--- 1.2/mysql-test/r/rpl_loadfile.result	2006-01-17 19:44:50 +01:00
+++ 1.3/mysql-test/r/rpl_loadfile.result	2006-02-21 17:55:27 +01:00
@@ -8,11 +8,11 @@
 DROP TABLE IF EXISTS test.t1;
 CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
 INSERT INTO test.t1  VALUES(1,'test');
-UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1;
+UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1;
 create procedure test.p1()
 begin
 INSERT INTO test.t1  VALUES(2,'test');
-UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2;
+UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2;
 end|
 CALL test.p1();
 SELECT * FROM test.t1 ORDER BY blob_column;

--- 1.2/mysql-test/r/rpl_row_001.result	2006-02-08 02:27:39 +01:00
+++ 1.3/mysql-test/r/rpl_row_001.result	2006-02-21 17:55:28 +01:00
@@ -5,7 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 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;
 LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
 SELECT * FROM t1  ORDER BY word LIMIT 10;
 word

--- 1.1/mysql-test/r/rpl_row_loaddata_m.result	2005-12-22 06:34:53 +01:00
+++ 1.2/mysql-test/r/rpl_row_loaddata_m.result	2006-02-21 17:55:28 +01:00
@@ -9,7 +9,7 @@
 create database mysqltest;
 use mysqltest;
 create table t1(a int, b int, unique(b));
-load data infile '../../std_data/rpl_loaddata.dat' into table t1;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	#

--- 1.1/mysql-test/r/rpl_row_stop_middle_update.result	2005-12-22 06:34:57 +01:00
+++ 1.2/mysql-test/r/rpl_row_stop_middle_update.result	2006-02-21 17:55:28 +01:00
@@ -5,7 +5,7 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 create table t1 (words varchar(20)) engine=myisam;
-load data infile '../../std_data/words.dat' into table t1 (words);
+load data infile '../std_data_ln/words.dat' into table t1 (words);
 select count(*) from t1;
 count(*)
 70

--- 1.1/mysql-test/t/mysqlbinlog_base64.test	2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/t/mysqlbinlog_base64.test	2006-02-21 17:55:26 +01:00
@@ -10,19 +10,19 @@
 update t1 set a=a+2 where a=3;
 
 create table t2 (word varchar(20));
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 
 #
 #  Save binlog
 #
---exec $MYSQL_BINLOG --hexdump $MYSQL_TEST_DIR/var/log/master-bin.000001 > $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
 #  Clear database and restore from binlog
 #
 drop table t1;
 drop table t2;
---exec $MYSQL test < $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
 #  Verify that all binlog events have been executed
@@ -33,6 +33,6 @@
 #
 #  Test cleanup
 #
---exec rm $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql
+--exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 drop table t1;
 drop table t2;

--- 1.3/mysql-test/t/rpl_LD_INFILE.test	2006-02-13 19:02:09 +01:00
+++ 1.4/mysql-test/t/rpl_LD_INFILE.test	2006-02-21 17:55:27 +01:00
@@ -16,10 +16,10 @@
 
 # Section 1 test 
 CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
-LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
 DELETE FROM test.t1 WHERE a = 'abashed';
 DELETE FROM test.t1;
-LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
 
 
 SELECT * FROM test.t1 ORDER BY a DESC;

--- 1.3/mysql-test/t/rpl_loaddata2.test	2006-02-13 19:02:15 +01:00
+++ 1.4/mysql-test/t/rpl_loaddata2.test	2006-02-21 17:55:27 +01:00
@@ -1,7 +1,7 @@
 --source include/master-slave.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;
 SELECT * FROM t1 ORDER BY word;
 sync_slave_with_master;
 

--- 1.4/mysql-test/t/rpl_loadfile.test	2006-02-14 00:49:34 +01:00
+++ 1.5/mysql-test/t/rpl_loadfile.test	2006-02-21 17:55:27 +01:00
@@ -24,12 +24,12 @@
 
 CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
 INSERT INTO test.t1  VALUES(1,'test');
-UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1;
+UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1;
 delimiter |;
 create procedure test.p1()
 begin
   INSERT INTO test.t1  VALUES(2,'test');
-  UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2;
+  UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2;
 end|
 delimiter ;|
 

--- 1.1/mysql-test/t/rpl_row_NOW.test	2005-12-22 06:35:00 +01:00
+++ 1.2/mysql-test/t/rpl_row_NOW.test	2006-02-21 17:55:28 +01:00
@@ -50,8 +50,8 @@
 
 connection master;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/NOW_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/NOW_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_slave.sql
 
 # lets cleanup
 DROP TABLE IF EXISTS mysqltest1.t1;
@@ -61,13 +61,13 @@
 # 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 :-) The failed dump 
-# files will be located in mysql-test/var/tmp
+# files will be located in $MYSQLTEST_VARDIR/tmp
 
-exec diff ./var/tmp/NOW_master.sql ./var/tmp/NOW_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/NOW_master.sql $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
 
 # If all is good, when can cleanup our dump files.
-system rm ./var/tmp/NOW_master.sql;
-system rm ./var/tmp/NOW_slave.sql;
+system rm $MYSQLTEST_VARDIR/tmp/NOW_master.sql;
+system rm $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
 
 sync_slave_with_master;
 # End of 5.1 test case

--- 1.2/mysql-test/t/rpl_row_func002.test	2006-02-13 19:02:22 +01:00
+++ 1.3/mysql-test/t/rpl_row_func002.test	2006-02-21 17:55:28 +01:00
@@ -84,8 +84,8 @@
 
 # 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/func002_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func002_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func002_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func002_slave.sql
 
 # Cleanup
 DROP FUNCTION test.f1;
@@ -97,7 +97,7 @@
 # the files your self to see what is not matching :-). The files are located
 # in mysql-test/var/tmp
 
-exec diff ./var/tmp/func002_master.sql ./var/tmp/func002_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/func002_master.sql $MYSQLTEST_VARDIR/tmp/func002_slave.sql;
 
 # End of 5.0 test case
 

--- 1.3/mysql-test/t/rpl_row_sp001.test	2006-02-13 19:02:22 +01:00
+++ 1.4/mysql-test/t/rpl_row_sp001.test	2006-02-21 17:55:28 +01:00
@@ -119,8 +119,8 @@
 
 # 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/sp001_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp001_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp001_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp001_slave.sql
 
 # First lets cleanup
 
@@ -135,12 +135,12 @@
 # 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 dump files
-# will be located in mysql-test/var/tmp
+# will be located in $MYSQLTEST_VARDIR/tmp
 
---exec diff ./var/tmp/sp001_master.sql ./var/tmp/sp001_slave.sql;
+--exec diff $MYSQLTEST_VARDIR/tmp/sp001_master.sql $MYSQLTEST_VARDIR/tmp/sp001_slave.sql;
 
 # If all is good, when can cleanup our dump files.
-system rm ./var/tmp/sp001_master.sql;
-system rm ./var/tmp/sp001_slave.sql;
+system rm $MYSQLTEST_VARDIR/tmp/sp001_master.sql;
+system rm $MYSQLTEST_VARDIR/tmp/sp001_slave.sql;
 
 # End of 5.0 test case

--- 1.2/mysql-test/t/rpl_row_sp011.test	2006-02-13 19:02:30 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp011.test	2006-02-21 17:55:29 +01:00
@@ -79,8 +79,8 @@
 sync_slave_with_master;
 #SELECT * FROM test.t2;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp011_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp011_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_slave.sql
 
 # Cleanup
 connection master;
@@ -100,12 +100,12 @@
 # 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 
-# Will leave dump files in mysql-test/var/tmp
+# Will leave dump files in $MYSQLTEST_VARDIR/tmp
 
-exec diff ./var/tmp/sp011_master.sql ./var/tmp/sp011_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/sp011_master.sql $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
 
 # If all is good, when can cleanup our dump files.
-system rm ./var/tmp/sp011_master.sql;
-system rm ./var/tmp/sp011_slave.sql;
+system rm $MYSQLTEST_VARDIR/tmp/sp011_master.sql;
+system rm $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_stop_middle_update.test	2005-12-22 06:35:05 +01:00
+++ 1.2/mysql-test/t/rpl_row_stop_middle_update.test	2006-02-21 17:55:28 +01:00
@@ -9,7 +9,7 @@
 connection master;
 create table t1 (words varchar(20)) engine=myisam;
 
-load data infile '../../std_data/words.dat' into table t1 (words);
+load data infile '../std_data_ln/words.dat' into table t1 (words);
 select count(*) from t1;
 save_master_pos;
 

--- 1.3/mysql-test/t/rpl_row_trig001.test	2006-02-13 19:02:36 +01:00
+++ 1.4/mysql-test/t/rpl_row_trig001.test	2006-02-21 17:55:28 +01:00
@@ -75,8 +75,8 @@
 
 # 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/trig001_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trig001_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trig001_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trig001_slave.sql
 
 # Cleanup
 connection master;
@@ -93,8 +93,8 @@
 # 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 tests 
-# will leave dump files in mysql-test/var/tmp
+# will leave dump files in $MYSQLTEST_VARDIR/tmp
 
-exec diff ./var/tmp/trig001_master.sql ./var/tmp/trig001_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/trig001_master.sql $MYSQLTEST_VARDIR/tmp/trig001_slave.sql;
 
 # End of 5.0 test case

--- 1.1/mysql-test/t/rpl_row_trig003.test	2005-12-22 06:35:06 +01:00
+++ 1.2/mysql-test/t/rpl_row_trig003.test	2006-02-21 17:55:28 +01:00
@@ -125,8 +125,8 @@
 
 # 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/trg003_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trg003_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trg003_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trg003_slave.sql
 
 # cleanup
 --disable_warnings
@@ -147,6 +147,6 @@
 DROP TABLE IF EXISTS test.t3;
 --enable_warnings
 
-exec diff ./var/tmp/trg003_master.sql ./var/tmp/trg003_slave.sql;
+exec diff $MYSQLTEST_VARDIR/tmp/trg003_master.sql $MYSQLTEST_VARDIR/tmp/trg003_slave.sql;
 
 # End of 5.0 test case

--- 1.2/mysql-test/t/rpl_sp004.test	2006-02-13 19:02:48 +01:00
+++ 1.3/mysql-test/t/rpl_sp004.test	2006-02-21 17:55:28 +01:00
@@ -76,8 +76,8 @@
 SELECT * FROM test.t2;
 #SELECT * FROM test.t3;
 
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp004_master.sql
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp004_slave.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
 
 # Cleanup
 connection master;
@@ -91,7 +91,7 @@
 
 # If the test fails, you will need to diff the dumps to see why.
 
--- exec diff ./var/tmp/sp004_master.sql ./var/tmp/sp004_slave.sql
+-- exec diff $MYSQLTEST_VARDIR/tmp/sp004_master.sql $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
 
 
 # End of 5.0 test case

--- 1.3/mysql-test/include/partition_1.inc	2006-01-20 22:27:56 +01:00
+++ 1.4/mysql-test/include/partition_1.inc	2006-02-21 17:55:29 +01:00
@@ -36,7 +36,7 @@
 
 ##### Option, for displaying files #####
 #
-# Attention: Displaying the directory content via "ls var/master-data/test/t*"
+# Attention: Displaying the directory content via "ls $MYSQLTEST_VARDIR/master-data/test/t*"
 #            is probably not portable.
 #            let $ls= 0; disables the execution of "ls ....."
 let $ls= 0;

--- 1.1/mysql-test/include/partition_layout.inc	2006-01-17 07:27:39 +01:00
+++ 1.2/mysql-test/include/partition_layout.inc	2006-02-21 17:55:29 +01:00
@@ -9,5 +9,5 @@
 # listing of files belonging to the table t1
 if ($ls)
 {
-   --exec ls var/master-data/test/t1*
+   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
 }

--- 1.62/mysql-test/t/show_check.test	2006-01-24 13:56:46 +01:00
+++ 1.63/mysql-test/t/show_check.test	2006-02-21 17:55:28 +01:00
@@ -393,7 +393,7 @@
 --error 1033
 show create table t1;
 drop table if exists t1;
-system rm -f var/master-data/test/t1.frm ;
+system rm -f $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
 
 
 # End of 4.1 tests

--- 1.17/mysql-test/t/loaddata.test	2006-01-24 13:56:45 +01:00
+++ 1.18/mysql-test/t/loaddata.test	2006-02-21 17:55:26 +01:00
@@ -135,6 +135,6 @@
 LOAD DATA INFILE 't@002d1' INTO TABLE t1;
 SELECT * FROM t1;
 DROP TABLE t1;
---exec rm $MYSQL_TEST_DIR/var/master-data/test/t@002d1
+--exec rm $MYSQLTEST_VARDIR/master-data/test/t@002d1
 SET character_set_filesystem=default;
 select @@character_set_filesystem;

--- 1.8/mysql-test/t/rpl_drop_db.test	2006-01-24 14:10:44 +01:00
+++ 1.9/mysql-test/t/rpl_drop_db.test	2006-02-21 17:55:28 +01:00
@@ -46,7 +46,7 @@
 use test;
 select * from t1;
 
-system rm  var/master-data/mysqltest1/f1.txt;
+system rm  $MYSQLTEST_VARDIR/master-data/mysqltest1/f1.txt;
 connection master;
 DROP DATABASE mysqltest1;
 sync_slave_with_master;

--- 1.17/mysql-test/r/rpl_load_table_from_master.result	2006-02-07 14:50:11 +01:00
+++ 1.18/mysql-test/r/rpl_load_table_from_master.result	2006-02-21 17:55:27 +01:00
@@ -29,9 +29,9 @@
 drop table t1;
 set SQL_LOG_BIN=0;
 create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
-load data infile '../../std_data/words.dat' into table t1;
+load data infile '../std_data_ln/words.dat' into table t1;
 create table t2 (word char(20) not null)ENGINE=MyISAM;
-load data infile '../../std_data/words.dat' into table t2;
+load data infile '../std_data_ln/words.dat' into table t2;
 create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
 load table t1 from master;
 load table t2 from master;

--- 1.1/mysql-test/r/ndb_load.result	2006-02-07 11:46:49 +01:00
+++ 1.2/mysql-test/r/ndb_load.result	2006-02-21 17:55:27 +01:00
@@ -1,10 +1,10 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;
+LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
 ERROR 23000: Can't write; duplicate key in table 't1'
 DROP TABLE t1;
 CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;
+LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
 SELECT * FROM t1 ORDER BY word;
 word
 Aarhus

--- 1.1/mysql-test/r/rpl_ndb_bank.result	2006-01-12 19:50:39 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_bank.result	2006-02-21 17:55:28 +01:00
@@ -49,7 +49,7 @@
 RESET MASTER;
 CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>

--- 1.4/mysql-test/r/rpl_ndb_sync.result	2006-02-10 12:56:47 +01:00
+++ 1.5/mysql-test/r/rpl_ndb_sync.result	2006-02-21 17:55:28 +01:00
@@ -27,7 +27,7 @@
 0	0	DEFGHIJKL
 CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
 DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
 @the_backup_id:=backup_id
 <the_backup_id>

--- 1.2/mysql-test/t/ndb_dd_dump.test	2006-02-02 10:55:57 +01:00
+++ 1.3/mysql-test/t/ndb_dd_dump.test	2006-02-21 17:55:27 +01:00
@@ -177,7 +177,7 @@
 INSERT INTO t3 VALUES 
 (1,1,1);
 
---exec $MYSQL_DUMP --skip-comments --compact -Y test > var/tmp/ndb_dd_dump.sql
+--exec $MYSQL_DUMP --skip-comments --compact -Y test > $MYSQLTEST_VARDIR/tmp/ndb_dd_dump.sql
 
 DROP TABLE t1;
 DROP TABLE t2;
@@ -206,7 +206,7 @@
 DROP LOGFILE GROUP lg1 ENGINE = NDB;
 DROP LOGFILE GROUP lg2 ENGINE = NDB;
 
---exec $MYSQL test < var/tmp/ndb_dd_dump.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/ndb_dd_dump.sql
 
 SELECT DISTINCT
   LOGFILE_GROUP_NAME,

--- 1.1/mysql-test/t/ndb_load.test	2006-02-07 11:46:49 +01:00
+++ 1.2/mysql-test/t/ndb_load.test	2006-02-21 17:55:27 +01:00
@@ -12,12 +12,12 @@
 # should give duplicate key
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;
 --error 1022
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;
+LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
 DROP TABLE t1;
 
 # now without a primary key we should be ok
 CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;
-LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ;
+LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
 SELECT * FROM t1 ORDER BY word;
 DROP TABLE t1;
 

--- 1.3/mysql-test/t/rpl_ndb_bank.test	2006-02-10 10:34:12 +01:00
+++ 1.4/mysql-test/t/rpl_ndb_bank.test	2006-02-21 17:55:28 +01:00
@@ -117,10 +117,10 @@
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
 
 # there is no neat way to find the backupid, this is a hack to find it...
---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat
+--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
 CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 --replace_column 1 <the_backup_id>
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
 let the_backup_id=`select @the_backup_id`;
@@ -191,17 +191,17 @@
 # 1. dump database BANK on both master and slave
 # 2. compare, there should be no difference
 #
---exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > ./var/tmp/master_BANK.sql
+--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > $MYSQLTEST_VARDIR/tmp/master_BANK.sql
 --connection master
 use test;
 create table t1 (a int primary key) engine=ndb;
 insert into t1 values (1);
 --sync_slave_with_master
---exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > ./var/tmp/slave_BANK.sql
+--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > $MYSQLTEST_VARDIR/tmp/slave_BANK.sql
 --connection master
 drop table t1;
 
---exec diff ./var/tmp/master_BANK.sql ./var/tmp/slave_BANK.sql
+--exec diff $MYSQLTEST_VARDIR/tmp/master_BANK.sql $MYSQLTEST_VARDIR/tmp/slave_BANK.sql
 
   --dec $2
 }

--- 1.5/mysql-test/t/rpl_ndb_sync.test	2006-02-10 12:58:38 +01:00
+++ 1.6/mysql-test/t/rpl_ndb_sync.test	2006-02-21 17:55:28 +01:00
@@ -26,10 +26,10 @@
 
 # take a backup on master
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
---exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat
+--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
 CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
 DELETE FROM cluster_replication.backup_info;
-LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
+LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 --replace_column 1 <the_backup_id>
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
 let the_backup_id=`select @the_backup_id` ;
Thread
bk commit into 5.1 tree (knielsen:1.2152)knielsen21 Feb