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.h | |
| 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.h')
| -rw-r--r-- | sql/field.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/field.h b/sql/field.h index f58833629b2..3b4285c9cc9 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1986,6 +1986,7 @@ public: Field_blob(uint32 packlength_arg) :Field_longstr((uchar*) 0, 0, (uchar*) "", 0, NONE, "temp", system_charset_info), packlength(packlength_arg) {} + /* Note that the default copy constructor is used, in clone() */ enum_field_types type() const { return MYSQL_TYPE_BLOB;} bool match_collation_to_optimize_range() const { return TRUE; } enum ha_base_keytype key_type() const @@ -2011,7 +2012,7 @@ public: uint32 key_length() const { return 0; } void sort_string(uchar *buff,uint length); uint32 pack_length() const - { return (uint32) (packlength+table->s->blob_ptr_size); } + { return (uint32) (packlength + portable_sizeof_char_ptr); } /** Return the packed length without the pointer size added. @@ -2486,9 +2487,6 @@ public: { return 255 - FRM_VCOL_HEADER_SIZE(interval != NULL); } - -private: - const String empty_set_string; }; |