diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 15:18:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 15:18:55 +0400 |
| commit | 6d7362eeb893d50b711853f3a04e8e529dd301ef (patch) | |
| tree | 63c9a7d1c79cbe25b8c76f5ccb275a35eef4ea66 /sql/field.h | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| parent | e1b9be5417668b184893148adea5f1f0e3a8d00f (diff) | |
| download | mariadb-git-6d7362eeb893d50b711853f3a04e8e529dd301ef.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h index c64d6bc443c..0f683086867 100644 --- a/sql/field.h +++ b/sql/field.h @@ -2440,6 +2440,11 @@ protected: */ String value; + void store_length(uchar *i_ptr, uint i_packlength, uint32 i_number); + inline void store_length(uint32 number) + { + store_length(ptr, packlength, number); + } public: Field_blob(uchar *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg, enum utype unireg_check_arg, const char *field_name_arg, @@ -2517,11 +2522,6 @@ public: int reset(void) { bzero(ptr, packlength+sizeof(uchar*)); return 0; } void reset_fields() { bzero((uchar*) &value,sizeof(value)); } uint32 get_field_buffer_size(void) { return value.alloced_length(); } - void store_length(uchar *i_ptr, uint i_packlength, uint32 i_number); - inline void store_length(uint32 number) - { - store_length(ptr, packlength, number); - } inline uint32 get_length(uint row_offset= 0) { return get_length(ptr+row_offset, this->packlength); } uint32 get_length(const uchar *ptr, uint packlength); @@ -2550,6 +2550,7 @@ public: { set_ptr_offset(0, length, data); } + int copy_value(Field_blob *from); uint get_key_image(uchar *buff,uint length, imagetype type); void set_key_image(const uchar *buff,uint length); Field *new_key_field(MEM_ROOT *root, TABLE *new_table, |