summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@quad.opbmk>2008-03-28 23:39:47 +0300
committerunknown <anozdrin/alik@quad.opbmk>2008-03-28 23:39:47 +0300
commit7021064aaee66583e8fb2775a335739d6c66fbe5 (patch)
treef692f6c05d5b12371ef4a47fad06583dae5362e1 /mysql-test/r/loaddata.result
parentafb4ac4545e07de958ca8721e1b7891ee4c0b955 (diff)
downloadmariadb-git-7021064aaee66583e8fb2775a335739d6c66fbe5.tar.gz
Fix tree:
1. Use 'dat' extension, because it is handled in Makefile.am; 2. Fix typo: the bug id is 35469, not 35649. mysql-test/std_data/bug35469.dat: Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat mysql-test/r/loaddata.result: Update result file. mysql-test/t/loaddata.test: 1. Use 'dat' extension, because it is handled in Makefile.am; 2. Fix typo: the bug id is 35469, not 35649.
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 156a78eb627..18b0d84a296 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -268,7 +268,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/bug35649.data' INTO TABLE v1
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
FIELDS ESCAPED BY '\\'
TERMINATED BY ','
ENCLOSED BY '"'
@@ -288,7 +288,7 @@ c1 c2
DELETE FROM t1;
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
FIELDS ESCAPED BY '\\'
TERMINATED BY ','
ENCLOSED BY '"'
@@ -308,14 +308,14 @@ c0 c1 c2
DELETE FROM t1;
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/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/bug35649.data' INTO TABLE v3
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
FIELDS ESCAPED BY '\\'
TERMINATED BY ','
ENCLOSED BY '"'