diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-15 18:01:22 +0200 |
| commit | e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2 (patch) | |
| tree | ba4f3d737607d1a87e68b4e48e1f41119bee3b82 /sql/field.cc | |
| parent | b427da7651f348550deb886024c0d3101720f00e (diff) | |
| download | mariadb-git-e1c76b80d91c43a9f17d9ec4c96e4dcb72efb1a2.tar.gz | |
Fixes for innodb suite, merging tests from 5.6.
Includes 5.6 changesets for:
*****
Fix for BUG#13489996 valgrind:conditional jump or move depends on uninitialised values-field_blob.
blob_ptr_size was not initialized properly: remove this variable.
*****
Bug#14021323 CRASH IN FIELD::SET_NULL WHEN INSERTING ROWS TO NEW TABLE
*****
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/field.cc b/sql/field.cc index a70bbe08469..d84baac41f5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1759,7 +1759,7 @@ uint Field::fill_cache_field(CACHE_FIELD *copy) if (flags & BLOB_FLAG) { copy->type= CACHE_BLOB; - copy->length-= table->s->blob_ptr_size; + copy->length-= portable_sizeof_char_ptr; return copy->length; } else if (!zero_pack() && @@ -9572,11 +9572,6 @@ Create_field::Create_field(Field *old_field,Field *orig_field) option_list= old_field->option_list; option_struct= old_field->option_struct; - /* Fix if the original table had 4 byte pointer blobs */ - if (flags & BLOB_FLAG) - pack_length= (pack_length- old_field->table->s->blob_ptr_size + - portable_sizeof_char_ptr); - switch (sql_type) { case MYSQL_TYPE_BLOB: switch (pack_length - portable_sizeof_char_ptr) { |