From 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@Sun.com>
Date: Sun, 11 Apr 2010 14:42:05 +0400
Subject: Some post-merge fixes afer a merge from mysql-5.1-bugteam.

---
 sql/field.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql')

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; }
-- 
cgit v1.2.1