diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 14:42:05 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 14:42:05 +0400 |
| commit | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (patch) | |
| tree | 4ff089ab16704e50adf007c463d313a7b3013294 /sql | |
| parent | 456235a13c7e8cb5ba14072ba24ceee5fb877719 (diff) | |
| download | mariadb-git-199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5.tar.gz | |
Some post-merge fixes afer a merge from mysql-5.1-bugteam.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index b4f5977d756..d50de966129 100644 --- a/sql/field.h +++ b/sql/field.h @@ -652,6 +652,10 @@ public: int store_decimal(const my_decimal *); int store(const char *to,uint length,CHARSET_INFO *cs)=0; uint size_of() const { return sizeof(*this); } + uint repertoire(void) const + { + return my_charset_repertoire(field_charset); + } CHARSET_INFO *charset(void) const { return field_charset; } void set_charset(CHARSET_INFO *charset_arg) { field_charset= charset_arg; } enum Derivation derivation(void) const { return field_derivation; } |