mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 08:14:18 +01:00
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.
This commit is contained in:
parent
afb4ac4545
commit
7021064aae
3 changed files with 8 additions and 8 deletions
mysql-test
|
@ -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 '"'
|
||||
|
|
|
@ -260,7 +260,7 @@ CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1;
|
|||
CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
|
||||
|
||||
--echo
|
||||
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 '"'
|
||||
|
@ -276,7 +276,7 @@ SELECT * FROM v1;
|
|||
DELETE FROM t1;
|
||||
|
||||
--echo
|
||||
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 '"'
|
||||
|
@ -293,7 +293,7 @@ DELETE FROM t1;
|
|||
|
||||
--echo
|
||||
--error ER_LOAD_DATA_INVALID_COLUMN
|
||||
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 '"'
|
||||
|
@ -301,7 +301,7 @@ LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
|
|||
|
||||
--echo
|
||||
--error ER_NON_UPDATABLE_TABLE
|
||||
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 '"'
|
||||
|
|
Loading…
Add table
Reference in a new issue