diff options
| author | bell@sanja.is.com.ua <> | 2005-11-20 20:47:07 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2005-11-20 20:47:07 +0200 |
| commit | 806f9e24ff1e9409d6b833c4ec1c07d3e45272c3 (patch) | |
| tree | 178b80a009c667cc88b5c83cbe9636892d375946 /sql/sql_load.cc | |
| parent | b13dd4ff72b55b0f015d181d99a48828017f2797 (diff) | |
| download | mariadb-git-806f9e24ff1e9409d6b833c4ec1c07d3e45272c3.tar.gz | |
Inefficient usage of String::append() fixed.
Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 568778c021d..2a0145af9c7 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -680,7 +680,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, length=(uint) (read_info.row_end-pos); if (!read_info.enclosed && - (enclosed_length && length == 4 && !memcmp(pos,"NULL",4)) || + (enclosed_length && length == 4 && + !memcmp(pos, STRING_WITH_LEN("NULL"))) || (length == 1 && read_info.found_null)) { if (item->type() == Item::FIELD_ITEM) |