1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/10.0' into 10.1

Browse Source
This commit is contained in:
Alexander Barkov 2015-12-29 18:44:13 +04:00
commit 1bb66ea88c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/field.h
View File

@ -2959,11 +2959,6 @@ protected:
*/ */
String value; 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: public:
Field_blob(uchar *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg, Field_blob(uchar *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg, enum utype unireg_check_arg, const char *field_name_arg,
@ -3041,6 +3036,11 @@ public:
int reset(void) { bzero(ptr, packlength+sizeof(uchar*)); return 0; } int reset(void) { bzero(ptr, packlength+sizeof(uchar*)); return 0; }
void reset_fields() { bzero((uchar*) &value,sizeof(value)); } void reset_fields() { bzero((uchar*) &value,sizeof(value)); }
uint32 get_field_buffer_size(void) { return value.alloced_length(); } 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) inline uint32 get_length(uint row_offset= 0)
{ return get_length(ptr+row_offset, this->packlength); } { return get_length(ptr+row_offset, this->packlength); }
uint32 get_length(const uchar *ptr, uint packlength); uint32 get_length(const uchar *ptr, uint packlength);