Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6fb53d30
Commit
6fb53d30
authored
Jul 01, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64)
for field terminators, uchar was compared with char
parent
9675ddc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
mysql-test/r/outfile_loaddata.result
mysql-test/r/outfile_loaddata.result
+0
-8
sql/sql_load.cc
sql/sql_load.cc
+1
-1
No files found.
mysql-test/r/outfile_loaddata.result
View file @
6fb53d30
...
@@ -143,15 +143,8 @@ TRUNCATE t2;
...
@@ -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
...
@@ -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;
...
...
sql/sql_load.cc
View file @
6fb53d30
...
@@ -1425,7 +1425,7 @@ inline int READ_INFO::terminator(char *ptr,uint length)
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment