diff options
| -rw-r--r-- | sql/field.cc | 2 | ||||
| -rw-r--r-- | sql/field.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 8395b8c6145..4fea6a085bb 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6412,7 +6412,7 @@ void Field_varstring::sql_type(String &res) const } -uint Field_varstring::data_length(const char *from) +uint32 Field_varstring::data_length(const char *from) { return length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr); } diff --git a/sql/field.h b/sql/field.h index 2ad564fc753..65e747e9d2f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1107,7 +1107,7 @@ public: int key_cmp(const byte *str, uint length); uint packed_col_length(const char *to, uint length); uint max_packed_col_length(uint max_length); - uint data_length(const char *from); + uint32 data_length(const char *from); uint size_of() const { return sizeof(*this); } enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; } bool has_charset(void) const |