summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2008-04-03 21:40:10 +0200
committerunknown <msvensson@pilot.mysql.com>2008-04-03 21:40:10 +0200
commit7674605d7940b428a8bbfe23fd0ef497e99c60c1 (patch)
tree76dd3a7c6efd70af4dfc8db28827b033dcd983df /mysql-test/r/loaddata.result
parent3ad402570dcc61e01979db294938123ea9eb4c46 (diff)
downloadmariadb-git-7674605d7940b428a8bbfe23fd0ef497e99c60c1.tar.gz
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
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result8
1 files changed, 4 insertions, 4 deletions
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 '"'