diff options
Diffstat (limited to 'sql/vers_string.h')
| -rw-r--r-- | sql/vers_string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/vers_string.h b/sql/vers_string.h index 756aea82794..0760613cd89 100644 --- a/sql/vers_string.h +++ b/sql/vers_string.h @@ -54,20 +54,20 @@ struct LEX_STRING_u : public Storage Storage::str= NULL; Storage::length= 0; } - LEX_STRING_u(const char *_str, uint32 _len, CHARSET_INFO *) + LEX_STRING_u(const char *_str, size_t _len, CHARSET_INFO *) { Storage::str= _str; Storage::length= _len; } uint32 length() const { - return Storage::length; + return (uint32)Storage::length; } const char *ptr() const { return Storage::str; } - void set(const char *_str, uint32 _len, CHARSET_INFO *) + void set(const char *_str, size_t _len, CHARSET_INFO *) { Storage::str= _str; Storage::length= _len; |