diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-04-26 11:52:58 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-04-26 11:52:58 +0200 |
| commit | 52d51b75e88e811221b66115494a13e52bf0d1a8 (patch) | |
| tree | 0a8a53b727e7b8a23e0a5c3f4f561c924e0097bc /sql/sql_load.cc | |
| parent | a3f7f01da66cc7d8be6e04184ef1f2c157f813f8 (diff) | |
| parent | 08bf3ddde99f6a6014efe9ecf10a976bdd741a8d (diff) | |
| download | mariadb-git-52d51b75e88e811221b66115494a13e52bf0d1a8.tar.gz | |
merge from 5.1
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 0589488d850..ae708178097 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1302,9 +1302,10 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs, String &field_term, String &line_start, String &line_term, String &enclosed_par, int escape, bool get_it_from_net, bool is_fifo) - :file(file_par),escape_char(escape) + :file(file_par), buff_length(tot_length), escape_char(escape), + found_end_of_line(false), eof(false), need_end_io_cache(false), + error(false), line_cuted(false), found_null(false), read_charset(cs) { - read_charset= cs; field_term_ptr=(char*) field_term.ptr(); field_term_length= field_term.length(); line_term_ptr=(char*) line_term.ptr(); @@ -1332,8 +1333,6 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs, (uchar) enclosed_par[0] : INT_MAX; field_term_char= field_term_length ? (uchar) field_term_ptr[0] : INT_MAX; line_term_char= line_term_length ? (uchar) line_term_ptr[0] : INT_MAX; - error=eof=found_end_of_line=found_null=line_cuted=0; - buff_length=tot_length; /* Set of a stack for unget if long terminators */ @@ -1379,7 +1378,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs, READ_INFO::~READ_INFO() { - if (!error && need_end_io_cache) + if (need_end_io_cache) ::end_io_cache(&cache); if (buffer != NULL) |