1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64)

Browse Source 
for field terminators, uchar was compared with char
This commit is contained in:
Sergei Golubchik 2013-07-01 17:54:24 +02:00
parent 9675ddc9a2
commit 6fb53d3013
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,15 +143,8 @@ 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 1638 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 1261 Row 1 doesn't contain data for all columns
Warning 1261 Row 1 doesn't contain data for all columns
Warning 1265 Data truncated for column 'a' at row 2
Warning 1261 Row 2 doesn't contain data for all columns
Warning 1261 Row 2 doesn't contain data for all columns
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 NULL NULL
1 ABC-АБВ DEF-ÂÃÄ 1 ABC-АБВ DEF-ÂÃÄ
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 'ъ';
@ -181,7 +174,6 @@ 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-ÂÃÄ
1 ABC-АБВ DEF-ÂÃÄÑŠ2
2 NULL NULL 2 NULL NULL
# Default (binary) charset: # Default (binary) charset:
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FROM t1; SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FROM t1;

2
sql/sql_load.cc
View File

@ -1425,7 +1425,7 @@ inline int READ_INFO::terminator(char *ptr,uint length)
uint i; uint i;
for (i=1 ; i < length ; i++) for (i=1 ; i < length ; i++)
{ {
if ((chr=GET) != *++ptr) if ((chr=GET) != *(uchar*)++ptr)
{ {
break; break;
} }