diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-10 16:04:07 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-10 16:04:07 +0200 |
| commit | a10350978814ec7f7ba7e64f6615847e0311cc69 (patch) | |
| tree | ac0c8cc9c36841305e8b1568add202c95b44a9fa /sql/sql_load.cc | |
| parent | a073ee45c290d81d365b48b03ef6924e778cd64f (diff) | |
| download | mariadb-git-a10350978814ec7f7ba7e64f6615847e0311cc69.tar.gz | |
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2
Compiling MySQL with gcc 4.3.2 and later produces a number of
warnings, many of which are new with the recent compiler
versions.
This bug will be resolved in more than one patch to limit the
size of changesets. This is the second patch, fixing more
of the warnings.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 5b9f8ea441d..83af6d477db 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -723,9 +723,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)) { @@ -1132,8 +1132,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; |