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

Merge from 5.0-bugteam

Browse Source
This commit is contained in:
Staale Smedseng
2009-06-17 16:56:44 +02:00
parent 388183a8a4 e6e1f4ac84 30fccdaaae
commit c429fac63c
23 changed files with 201 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_load.cc
View File

@@ -750,9 +750,9 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
real_item= item->real_item();
if (!read_info.enclosed &&
if ((!read_info.enclosed &&
(enclosed_length && length == 4 &&
!memcmp(pos, STRING_WITH_LEN("NULL"))) ||
!memcmp(pos, STRING_WITH_LEN("NULL")))) ||
(length == 1 && read_info.found_null))
{
@@ -1151,8 +1151,8 @@ int READ_INFO::read_field()
}
// End of enclosed field if followed by field_term or line_term
if (chr == my_b_EOF ||
chr == line_term_char && terminator(line_term_ptr,
line_term_length))
(chr == line_term_char && terminator(line_term_ptr,
line_term_length)))
{ // Maybe unexpected linefeed
enclosed=1;
found_end_of_line=1;