diff options
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 50dcb397616..7aa45cf1177 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1352,7 +1352,7 @@ public: longlong convert_decimal2longlong(const my_decimal *val, bool unsigned_flag, int *err); /* The max. number of characters */ - virtual uint32 char_length() + virtual uint32 char_length() const { return field_length / charset()->mbmaxlen; } @@ -3311,7 +3311,7 @@ public: memcpy(ptr,length,packlength); memcpy(ptr+packlength, &data,sizeof(char*)); } - void set_ptr_offset(my_ptrdiff_t ptr_diff, uint32 length, uchar *data) + void set_ptr_offset(my_ptrdiff_t ptr_diff, uint32 length, const uchar *data) { uchar *ptr_ofs= ADD_TO_PTR(ptr,ptr_diff,uchar*); store_length(ptr_ofs, packlength, length); @@ -3379,7 +3379,7 @@ public: bool has_charset(void) const { return charset() == &my_charset_bin ? FALSE : TRUE; } uint32 max_display_length(); - uint32 char_length(); + uint32 char_length() const; uint is_equal(Create_field *new_field); private: int do_save_field_metadata(uchar *first_byte); |