summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2016-10-16 11:39:55 +0000
committerSergei Petrunia <psergey@askmonty.org>2016-10-16 11:39:55 +0000
commitb42248d2f2583d29142cf9b0c81c1994249edbcb (patch)
tree95876d2a96f548eb004f0610b3280df55e904b6c /sql/field.h
parenta7091b0679bed9f58609c173e4b036a51c69b730 (diff)
downloadmariadb-git-b42248d2f2583d29142cf9b0c81c1994249edbcb.tar.gz
MyRocks port: make Field::char_length() a const function
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h
index f550dad1c6c..0bb9da83827 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1335,7 +1335,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;
}
@@ -3316,7 +3316,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);