database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

post-push fix: Preserving warning codes from mysql-next-mr. Updated

Browse Source 
result files.

Warnings affected:
 - WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
 - ER_TOO_LONG_FIELD_COMMENT
This commit is contained in:
Luis Soares
2009-10-23 10:29:59 +01:00
parent ea858f1857
commit aa12c04656
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/outfile_loaddata.result
View File

@@ -92,14 +92,14 @@ HEX(c1)
C3 C3
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' FIELDS ENCLOSED BY 0xC3 FROM t1; SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' FIELDS ENCLOSED BY 0xC3 FROM t1;
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
TRUNCATE t1; TRUNCATE t1;
SELECT HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt')); SELECT HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'));
HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt')) HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'))
C35CC3C30A C35CC3C30A
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3;
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
SELECT HEX(c1) FROM t1; SELECT HEX(c1) FROM t1;
HEX(c1) HEX(c1)
C3 C3
@@ -124,17 +124,17 @@ ERROR 42000: Field separator argument is not what is expected; check the manual
# LOAD DATA rises error or has unpredictable result -- to be fixed later # LOAD DATA rises error or has unpredictable result -- to be fixed later
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ENCLOSED BY 'ъ'; SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ENCLOSED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ENCLOSED BY 'ъ'; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ENCLOSED BY 'ъ';
ERROR 42000: Field separator argument is not what is expected; check the manual ERROR 42000: Field separator argument is not what is expected; check the manual
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ESCAPED BY 'ъ'; SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ESCAPED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ESCAPED BY 'ъ'; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ESCAPED BY 'ъ';
ERROR 42000: Field separator argument is not what is expected; check the manual ERROR 42000: Field separator argument is not what is expected; check the manual
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS TERMINATED BY 'ъ'; SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS TERMINATED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
################################################## ##################################################
1ъABC-<2D><><EFBFBD>ъDEF-<2D><><EFBFBD> 1ъABC-<2D><><EFBFBD>ъDEF-<2D><><EFBFBD>
2ъ\Nъ\N 2ъ\Nъ\N
@@ -142,7 +142,7 @@ Warning 1639 Non-ASCII separator arguments are not fully supported
TRUNCATE t2; TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ'; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1265 Data truncated for column 'a' at row 1 Warning 1265 Data truncated for column 'a' at row 1
Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 1 doesn't contain data for all columns
Warning 1261 Row 1 doesn't contain data for all columns Warning 1261 Row 1 doesn't contain data for all columns
@@ -156,7 +156,7 @@ a b c
2 NULL NULL 2 NULL NULL
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ъ'; SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
################################################## ##################################################
ъ1 ABC-<2D><><EFBFBD> DEF-<2D><><EFBFBD> ъ1 ABC-<2D><><EFBFBD> DEF-<2D><><EFBFBD>
ъ2 \N \N ъ2 \N \N
@@ -164,20 +164,20 @@ Warning 1639 Non-ASCII separator arguments are not fully supported
TRUNCATE t2; TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES STARTING BY 'ъ'; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES STARTING BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c; SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
a b c a b c
1 ABC-АБВ DEF-ÂÃÄ 1 ABC-АБВ DEF-ÂÃÄ
2 NULL NULL 2 NULL NULL
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES TERMINATED BY 'ъ'; SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES TERMINATED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
################################################## ##################################################
1 ABC-<2D><><EFBFBD> DEF-<2D><><EFBFBD>ъ2 \N \Nъ################################################## 1 ABC-<2D><><EFBFBD> DEF-<2D><><EFBFBD>ъ2 \N \Nъ##################################################
TRUNCATE t2; TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ъ'; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ъ';
Warnings: Warnings:
Warning 1639 Non-ASCII separator arguments are not fully supported Warning 1638 Non-ASCII separator arguments are not fully supported
SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c; SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
a b c a b c
1 ABC-АБВ DEF-ÂÃÄ 1 ABC-АБВ DEF-ÂÃÄ

2
mysql-test/r/strict.result
View File

@@ -1327,7 +1327,7 @@ create table t1
123456789*123456789*123456789*123456789* 123456789*123456789*123456789*123456789*
123456789*123456789*123456789*123456789*'); 123456789*123456789*123456789*123456789*');
Warnings: Warnings:
Warning 1630 Comment for field 'i' is too long (max = 255) Warning 1629 Comment for field 'i' is too long (max = 255)
select column_name, column_comment from information_schema.columns where select column_name, column_comment from information_schema.columns where
table_schema = 'test' and table_name = 't1'; table_schema = 'test' and table_name = 't1';
column_name column_comment column_name column_comment