database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4028 - Converted rdiff files to uniform

Browse Source 
MDEV-11 - Modifed tests and result files to use explicit column lists
          in INSERT and SELECT statements
This commit is contained in:
Elena Stepanova
2013-02-03 02:53:57 +04:00
parent 1701ee3357
commit 7f444caa0a
213 changed files with 7031 additions and 5955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
mysql-test/suite/storage_engine/loaddata.result
View File

@@ -1,8 +1,8 @@
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
FIELDS TERMINATED BY ',';
SELECT * FROM t1;
FIELDS TERMINATED BY ',' (a,b);
SELECT a,b FROM t1;
a b
1 foo
2 bar
@@ -10,8 +10,8 @@ a b
4 abc
LOAD DATA LOCAL INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
CHARACTER SET utf8 COLUMNS TERMINATED BY ','
ESCAPED BY '/';
SELECT * FROM t1;
ESCAPED BY '/' (a,b);
SELECT a,b FROM t1;
a b
1 foo
1 foo
@@ -21,27 +21,6 @@ a b
3
4 abc
4 abc
LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
FIELDS TERMINATED BY ';'
OPTIONALLY ENCLOSED BY ''''
LINES STARTING BY 'prefix:'
IGNORE 2 LINES
(a,b);
Warnings:
Warning 1262 Row 2 was truncated; it contained more data than there were input columns
SELECT * FROM t1;
a b
0
1 foo
1 foo
100 foo
2 bar
2 bar
3
3
4 abc
4 abc
7 test
LOAD DATA LOCAL INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
FIELDS TERMINATED BY ';'
(a) SET b='loaded';
@@ -49,7 +28,27 @@ Warnings:
Warning 1262 Row 1 was truncated; it contained more data than there were input columns
Warning 1262 Row 2 was truncated; it contained more data than there were input columns
Warning 1262 Row 3 was truncated; it contained more data than there were input columns
SELECT * FROM t1;
SELECT a,b FROM t1;
a b
0 loaded
1 foo
1 foo
102 loaded
2 bar
2 bar
3
3
4 abc
4 abc
5 loaded
LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
FIELDS TERMINATED BY ';'
OPTIONALLY ENCLOSED BY ''''
LINES STARTING BY 'prefix:'
IGNORE 2 LINES (a,b);
Warnings:
Warning 1262 Row 2 was truncated; it contained more data than there were input columns
SELECT a,b FROM t1;
a b
0
0 loaded
@@ -65,4 +64,25 @@ a b
4 abc
5 loaded
7 test
LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1;
SELECT a,b FROM t1;
a b
0
0 loaded
1 foo
1 foo
1 foo
100 foo
102 loaded
2 bar
2 bar
2 bar
3
3
3
4 abc
4 abc
4 abc
5 loaded
7 test
DROP TABLE t1;