Fix paths in test and result files

mysql-test/r/loaddata.result:
  Update paths in result
mysql-test/r/myisam.result:
  Update paths in result
mysql-test/r/partition_not_windows.result:
  Update paths in result
mysql-test/r/symlink.result:
  Update paths in result
mysql-test/suite/binlog/r/binlog_index.result:
  Update paths in result
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
  Update paths
mysql-test/suite/binlog/t/binlog_index.test:
  Update paths
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
  Fix merge error s/start-position/stop-position/
mysql-test/t/drop.test:
  Update paths
mysql-test/t/loaddata.test:
  Update paths
mysql-test/t/myisam.test:
  Update paths
mysql-test/t/partition_not_windows.test:
  Update paths
mysql-test/t/symlink.test:
  Update paths

5 files changed, 15 insertions, 54 deletions

diff --git a/mysql-test/r/binlog_index.result b/mysql-test/r/binlog_index.result
deleted file mode 100644
index 9f3c3746bd4..00000000000
--- a/mysql-test/r/binlog_index.result
+++ /dev/null
@@ -1,39 +0,0 @@
-flush logs;
-flush logs;
-flush logs;
-show binary logs;
-Log_name	File_size
-master-bin.000001	#
-master-bin.000002	#
-master-bin.000003	#
-master-bin.000004	#
-purge binary logs TO 'master-bin.000004';
-Warnings:
-Warning	1612	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
-*** must show a list starting from the 'TO' argument of PURGE ***
-show binary logs;
-Log_name	File_size
-master-bin.000004	#
-reset master;
-flush logs;
-flush logs;
-flush logs;
-*** must be a warning master-bin.000001 was not found ***
-Warnings:
-Warning	1612	Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
-*** must show one record, of the active binlog, left in the index file after PURGE ***
-show binary logs;
-Log_name	File_size
-master-bin.000004	#
-reset master;
-flush logs;
-flush logs;
-flush logs;
-purge binary logs TO 'master-bin.000002';
-ERROR HY000: Fatal error during log purge
-show warnings;
-Level	Code	Message
-Error	1377	a problem with deleting MYSQLTEST_VARDIR/log/master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
-Error	1377	Fatal error during log purge
-reset master;
-End of tests
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index d01feed8099..3aef9ef636d 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -277,7 +277,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
 CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1;
 CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v1
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -297,7 +297,7 @@ c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -317,14 +317,14 @@ c0	c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
   LINES TERMINATED BY '\n' (c0, c2);
 ERROR HY000: Invalid column reference (v2.c0) in LOAD DATA
 
-LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
+LOAD DATA INFILE '../../std_data/bug35469.dat' INTO TABLE v3
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 112a7b7649b..2a25f2db0e1 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -2194,7 +2194,7 @@ KEY (c1),
 KEY (c2)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0;
 
-MyISAM file:         MYSQLTEST_VARDIR/master-data/test/t1
+MyISAM file:         MYSQLD_DATADIR/test/t1
 Record format:       Packed
 Character set:       utf8_general_ci (33)
 Data records:                    0  Deleted blocks:                 0
diff --git a/mysql-test/r/partition_not_windows.result b/mysql-test/r/partition_not_windows.result
index 44afdea3855..c7fdcf6de2b 100644
--- a/mysql-test/r/partition_not_windows.result
+++ b/mysql-test/r/partition_not_windows.result
@@ -35,20 +35,20 @@ DROP TABLE t1, t2;
 set @@sql_mode=@org_mode;
 CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');
+(PARTITION p0 DATA DIRECTORY 'MYSQLD_DATADIR/test');
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
 PARTITION BY KEY (a)
-(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');
+(PARTITION p0 INDEX DIRECTORY 'MYSQLD_DATADIR/test');
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE ts (id INT, purchased DATE)
 PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-DATA DIRECTORY = 'TEST_DIR/master-data/test',
+DATA DIRECTORY = 'MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-DATA DIRECTORY = 'TEST_DIR/master-data/test'
+DATA DIRECTORY = 'MYSQLD_DATADIR/test'
 ));
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE ts (id INT, purchased DATE)
@@ -56,9 +56,9 @@ PARTITION BY RANGE(YEAR(purchased))
 SUBPARTITION BY HASH(TO_DAYS(purchased)) (
 PARTITION p0 VALUES LESS THAN (1990) (
 SUBPARTITION s0a
-INDEX DIRECTORY = 'TEST_DIR/master-data/test',
+INDEX DIRECTORY = 'MYSQLD_DATADIR/test',
 SUBPARTITION s0b
-INDEX DIRECTORY = 'TEST_DIR/master-data/test'
+INDEX DIRECTORY = 'MYSQLD_DATADIR/test'
 ));
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 DROP TABLE IF EXISTS `example`;
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index bda0d7d1451..41b0c2b2488 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -151,16 +151,16 @@ CREATE TABLE t1 (a INT) ENGINE MYISAM;
 DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='TEST_DIR/master-data/mysql';
+INDEX DIRECTORY='MYSQLD_DATADIR/mysql';
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='TEST_DIR/master-data/test';
+DATA DIRECTORY='MYSQLD_DATADIR/test';
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
-DATA DIRECTORY='TEST_DIR/master-data/';
+DATA DIRECTORY='MYSQLD_DATADIR/';
 ERROR HY000: Incorrect arguments to DATA DIRECTORY
 CREATE TABLE t1(a INT)
-INDEX DIRECTORY='TEST_DIR/master-data';
+INDEX DIRECTORY='MYSQLD_DATADIR';
 ERROR HY000: Incorrect arguments to INDEX DIRECTORY
 CREATE TABLE t1(a INT)
 INDEX DIRECTORY='TEST_DIR/master-data_var';