Merge lp:~mumair/drizzle/trunk-bug-621859-v2 into lp:~drizzle-trunk/drizzle/development

[Muhammad Umair]

Merged charset declarations of global_charset_info.h and charset_info.h into charset.h header file.

After that I needed to remove global_charset_info.h and charset_info.h header declarations from all the drizzle code base. I wrote a script that search for global_charset_info.h in all the source code files and replace it with charset.h if that file does not already have charset.h header declaration otherwise it just remove global_charset_info.h from that particular file. I wrote a smilar scrpt for replacing charset_info.h with charset.h

I then restructured charset.h in order to make it more structural. i.e All the extern declarations are consolidated together one after the other. Similar pattern has been followed for struct declarations and functions in the charset.h header file

Plus: Fixed the minor bugs in my initial branch. Thank to Olaf, Monty Taylor and Stewar.t

=== modified file 'client/drizzletest.cc'
--- client/drizzletest.cc	2011-04-15 14:05:17 +0000
+++ client/drizzletest.cc	2011-04-20 22:33:33 +0000
@@ -70,7 +70,6 @@
 #include <drizzled/gettext.h>
 
 #include <drizzled/definitions.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/type/time.h>
 #include <drizzled/charset.h>

=== modified file 'drizzled/charset-def.cc'
--- drizzled/charset-def.cc	2011-03-28 02:46:21 +0000
+++ drizzled/charset-def.cc	2011-04-20 22:33:33 +0000
@@ -15,7 +15,6 @@
 
 #include <config.h>
 #include <drizzled/charset.h>
-#include <drizzled/charset_info.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/charset.cc'
--- drizzled/charset.cc	2011-03-28 02:46:21 +0000
+++ drizzled/charset.cc	2011-04-20 22:33:33 +0000
@@ -17,7 +17,6 @@
 
 #include <drizzled/charset.h>
 #include <drizzled/error.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/configmake.h>
 #include <vector>

=== modified file 'drizzled/charset.h'
--- drizzled/charset.h	2011-03-28 02:46:21 +0000
+++ drizzled/charset.h	2011-04-20 22:33:33 +0000
@@ -17,36 +17,309 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+/*
+  Header File that defines all the charset declarations being used in Drizzle source code
+*/
+
 #pragma once
 
+#include <sys/types.h>
 #include <cstddef>
+#include <drizzled/visibility.h>
 #include <drizzled/definitions.h>
 
-#include <drizzled/visibility.h>
-
 namespace drizzled
 {
 
-struct charset_info_st;
+#define MY_CS_NAME_SIZE			32
+#define MY_CS_CTYPE_TABLE_SIZE		257
+#define MY_CS_TO_LOWER_TABLE_SIZE	256
+#define MY_CS_TO_UPPER_TABLE_SIZE	256
+#define MY_CS_SORT_ORDER_TABLE_SIZE	256
+#define MY_CS_TO_UNI_TABLE_SIZE		256
+#define CHARSET_DIR	"charsets/"
+#define my_wc_t unsigned long
+/* wm_wc and wc_mb return codes */
+#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */
+#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */
+#define MY_CS_TOOSMALL  -101  /* Need at least one byte:    wc_mb and mb_wc */
+#define MY_CS_TOOSMALL2 -102  /* Need at least two bytes:   wc_mb and mb_wc */
+#define MY_CS_TOOSMALL3 -103  /* Need at least three bytes: wc_mb and mb_wc */
+/* These following three are currently not really used */
+#define MY_CS_TOOSMALL4 -104  /* Need at least 4 bytes: wc_mb and mb_wc */
+#define MY_CS_TOOSMALL5 -105  /* Need at least 5 bytes: wc_mb and mb_wc */
+#define MY_CS_TOOSMALL6 -106  /* Need at least 6 bytes: wc_mb and mb_wc */
+#define MY_SEQ_INTTAIL	1
+#define MY_SEQ_SPACES	2
+#define MY_CS_COMPILED  1      /* compiled-in sets               */
+#define MY_CS_CONFIG    2      /* sets that have a *.conf file   */
+#define MY_CS_INDEX     4      /* sets listed in the Index file  */
+#define MY_CS_LOADED    8      /* sets that are currently loaded */
+#define MY_CS_BINSORT	16     /* if binary sort order           */
+#define MY_CS_PRIMARY	32     /* if primary collation           */
+#define MY_CS_STRNXFRM	64     /* if strnxfrm is used for sort   */
+#define MY_CS_UNICODE	128    /* is a charset is full unicode   */
+#define MY_CS_READY	256    /* if a charset is initialized    */
+#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
+#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */
+#define MY_CS_HIDDEN	2048   /* don't display in SHOW          */
+#define MY_CS_NONASCII  8192   /* if not ASCII-compatible        */
+#define MY_CHARSET_UNDEFINED 0
+/* Flags for strxfrm */
+#define MY_STRXFRM_LEVEL1          0x00000001 /* for primary weights   */
+#define MY_STRXFRM_LEVEL2          0x00000002 /* for secondary weights */
+#define MY_STRXFRM_LEVEL3          0x00000004 /* for tertiary weights  */
+#define MY_STRXFRM_LEVEL4          0x00000008 /* fourth level weights  */
+#define MY_STRXFRM_LEVEL5          0x00000010 /* fifth level weights   */
+#define MY_STRXFRM_LEVEL6          0x00000020 /* sixth level weights   */
+#define MY_STRXFRM_LEVEL_ALL       0x0000003F /* Bit OR for the above six */
+#define MY_STRXFRM_NLEVELS         6          /* Number of possible levels*/
+#define MY_STRXFRM_PAD_WITH_SPACE  0x00000040 /* if pad result with spaces */
+#define MY_STRXFRM_UNUSED_00000080 0x00000080 /* for future extensions     */
+#define MY_STRXFRM_DESC_LEVEL1     0x00000100 /* if desc order for level1 */
+#define MY_STRXFRM_DESC_LEVEL2     0x00000200 /* if desc order for level2 */
+#define MY_STRXFRM_DESC_LEVEL3     0x00000300 /* if desc order for level3 */
+#define MY_STRXFRM_DESC_LEVEL4     0x00000800 /* if desc order for level4 */
+#define MY_STRXFRM_DESC_LEVEL5     0x00001000 /* if desc order for level5 */
+#define MY_STRXFRM_DESC_LEVEL6     0x00002000 /* if desc order for level6 */
+#define MY_STRXFRM_DESC_SHIFT      8
+#define MY_STRXFRM_UNUSED_00004000 0x00004000 /* for future extensions     */
+#define MY_STRXFRM_UNUSED_00008000 0x00008000 /* for future extensions     */
+#define MY_STRXFRM_REVERSE_LEVEL1  0x00010000 /* if reverse order for level1 */
+#define MY_STRXFRM_REVERSE_LEVEL2  0x00020000 /* if reverse order for level2 */
+#define MY_STRXFRM_REVERSE_LEVEL3  0x00040000 /* if reverse order for level3 */
+#define MY_STRXFRM_REVERSE_LEVEL4  0x00080000 /* if reverse order for level4 */
+#define MY_STRXFRM_REVERSE_LEVEL5  0x00100000 /* if reverse order for level5 */
+#define MY_STRXFRM_REVERSE_LEVEL6  0x00200000 /* if reverse order for level6 */
+#define MY_STRXFRM_REVERSE_SHIFT   16
+#define ILLEGAL_CHARSET_INFO_NUMBER (UINT32_MAX)
+#define MY_UTF8MB4                 "utf8"
+#define my_charset_utf8_general_ci ::drizzled::my_charset_utf8mb4_general_ci
+#define my_charset_utf8_bin        ::drizzled::my_charset_utf8mb4_bin
+#define	_MY_U	01	/* Upper case */
+#define	_MY_L	02	/* Lower case */
+#define	_MY_NMR	04	/* Numeral (digit) */
+#define	_MY_SPC	010	/* Spacing character */
+#define	_MY_PNT	020	/* Punctuation */
+#define	_MY_CTR	040	/* Control character */
+#define	_MY_B	0100	/* Blank */
+#define	_MY_X	0200	/* heXadecimal digit */
+
+/* Some typedef to make it easy for C++ to make function pointers */
+typedef int (*my_charset_conv_mb_wc)(const struct charset_info_st * const, my_wc_t *,
+                                     const unsigned char *, const unsigned char *);
+typedef int (*my_charset_conv_wc_mb)(const struct charset_info_st * const, my_wc_t,
+                                     unsigned char *, unsigned char *);
+typedef size_t (*my_charset_conv_case)(const struct charset_info_st * const,
+                                       char *, size_t, char *, size_t);
+struct charset_info_st;
+typedef struct unicase_info_st
+{
+  uint16_t toupper;
+  uint16_t tolower;
+  uint16_t sort;
+} MY_UNICASE_INFO;
+
+typedef struct uni_ctype_st
+{
+  unsigned char  pctype;
+  unsigned char  *ctype;
+} MY_UNI_CTYPE;
+
+/* A helper function for "need at least n bytes" */
+inline static int my_cs_toosmalln(int n)
+{
+  return -100-n;
+}
+
+typedef struct my_uni_idx_st
+{
+  uint16_t from;
+  uint16_t to;
+  unsigned char  *tab;
+} MY_UNI_IDX;
+
+typedef struct
+{
+  uint32_t beg;
+  uint32_t end;
+  uint32_t mb_len;
+} my_match_t;
+
+enum my_lex_states
+{
+  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT,
+  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
+  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,
+  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
+  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
+  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,
+  MY_LEX_LONG_COMMENT, MY_LEX_END_LONG_COMMENT, MY_LEX_SEMICOLON,
+  MY_LEX_SET_VAR, MY_LEX_USER_END, MY_LEX_HOSTNAME, MY_LEX_SKIP,
+  MY_LEX_USER_VARIABLE_DELIMITER, MY_LEX_SYSTEM_VAR,
+  MY_LEX_IDENT_OR_KEYWORD,
+  MY_LEX_IDENT_OR_HEX, MY_LEX_IDENT_OR_BIN,
+  MY_LEX_STRING_OR_DELIMITER
+};
+
+struct charset_info_st;
+
+/* See strings/charset_info_st.txt for information about this structure  */
+typedef struct my_collation_handler_st
+{
+  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
+  /* Collation routines */
+  int     (*strnncoll)(const struct charset_info_st * const,
+		       const unsigned char *, size_t, const unsigned char *, size_t, bool);
+  int     (*strnncollsp)(const struct charset_info_st * const,
+                         const unsigned char *, size_t, const unsigned char *, size_t,
+                         bool diff_if_only_endspace_difference);
+  size_t  (*strnxfrm)(const struct charset_info_st * const,
+                      unsigned char *dst, size_t dstlen, uint32_t nweights,
+                      const unsigned char *src, size_t srclen, uint32_t flags);
+  size_t    (*strnxfrmlen)(const struct charset_info_st * const, size_t);
+  bool (*like_range)(const struct charset_info_st * const,
+                        const char *s, size_t s_length,
+                        char escape, char w_one, char w_many,
+                        size_t res_length,
+                        char *min_str, char *max_str,
+                        size_t *min_len, size_t *max_len);
+  int     (*wildcmp)(const struct charset_info_st * const,
+  		     const char *str,const char *str_end,
+                     const char *wildstr,const char *wildend,
+                     int escape,int w_one, int w_many);
+
+  int  (*strcasecmp)(const struct charset_info_st * const, const char *, const char *);
+
+  uint32_t (*instr)(const struct charset_info_st * const,
+                const char *b, size_t b_length,
+                const char *s, size_t s_length,
+                my_match_t *match, uint32_t nmatch);
+
+  /* Hash calculation */
+  void (*hash_sort)(const struct charset_info_st *cs, const unsigned char *key, size_t len,
+                    uint32_t *nr1, uint32_t *nr2);
+  bool (*propagate)(const struct charset_info_st *cs, const unsigned char *str, size_t len);
+} MY_COLLATION_HANDLER;
+
+/* See strings/charset_info_st.txt about information on this structure  */
+typedef struct my_charset_handler_st
+{
+  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
+  /* Multibyte routines */
+  uint32_t    (*ismbchar)(const struct charset_info_st * const, const char *, const char *);
+  uint32_t    (*mbcharlen)(const struct charset_info_st * const, uint32_t c);
+  size_t  (*numchars)(const struct charset_info_st * const, const char *b, const char *e);
+  size_t  (*charpos)(const struct charset_info_st * const, const char *b, const char *e,
+                     size_t pos);
+  size_t  (*well_formed_len)(const struct charset_info_st * const,
+                             const char *b,const char *e,
+                             size_t nchars, int *error);
+  size_t  (*lengthsp)(const struct charset_info_st * const, const char *ptr, size_t length);
+  size_t  (*numcells)(const struct charset_info_st * const, const char *b, const char *e);
+
+  /* Unicode conversion */
+  my_charset_conv_mb_wc mb_wc;
+  my_charset_conv_wc_mb wc_mb;
+
+  /* CTYPE scanner */
+  int (*ctype)(const struct charset_info_st *cs, int *ctype,
+               const unsigned char *s, const unsigned char *e);
+
+  /* Functions for case and sort conversion */
+  size_t  (*caseup_str)(const struct charset_info_st * const, char *);
+  size_t  (*casedn_str)(const struct charset_info_st * const, char *);
+
+  my_charset_conv_case caseup;
+  my_charset_conv_case casedn;
+
+  /* Charset dependant snprintf() */
+  size_t (*snprintf)(const struct charset_info_st * const, char *to, size_t n,
+                     const char *fmt,
+                     ...)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+                         __attribute__((format(printf, 4, 5)))
+#endif
+                         ;
+  size_t (*long10_to_str)(const struct charset_info_st * const, char *to, size_t n,
+                          int radix, long int val);
+  size_t (*int64_t10_to_str)(const struct charset_info_st * const, char *to, size_t n,
+                              int radix, int64_t val);
+
+  void (*fill)(const struct charset_info_st * const, char *to, size_t len, int fill);
+
+  /* String-to-number conversion routines */
+  long        (*strntol)(const struct charset_info_st * const, const char *s, size_t l,
+			 int base, char **e, int *err);
+  unsigned long      (*strntoul)(const struct charset_info_st * const, const char *s, size_t l,
+			 int base, char **e, int *err);
+  int64_t   (*strntoll)(const struct charset_info_st * const, const char *s, size_t l,
+			 int base, char **e, int *err);
+  uint64_t (*strntoull)(const struct charset_info_st * const, const char *s, size_t l,
+			 int base, char **e, int *err);
+  double      (*strntod)(const struct charset_info_st * const, char *s, size_t l, char **e,
+			 int *err);
+  int64_t    (*strtoll10)(const struct charset_info_st *cs,
+                           const char *nptr, char **endptr, int *error);
+  uint64_t   (*strntoull10rnd)(const struct charset_info_st *cs,
+                                const char *str, size_t length,
+                                int unsigned_fl,
+                                char **endptr, int *error);
+  size_t        (*scan)(const struct charset_info_st * const, const char *b, const char *e,
+                        int sq);
+} MY_CHARSET_HANDLER;
+
+
+/* See strings/charset_info_st.txt about information on this structure  */
+struct charset_info_st
+{
+  uint32_t      number;
+  uint32_t      primary_number;
+  uint32_t      binary_number;
+  uint32_t      state;
+  const char *csname;
+  const char *name;
+  const char *comment;
+  const char *tailoring;
+  unsigned char    *ctype;
+  unsigned char    *to_lower;
+  unsigned char    *to_upper;
+  unsigned char    *sort_order;
+  uint16_t   *contractions;
+  uint16_t   **sort_order_big;
+  uint16_t      *tab_to_uni;
+  MY_UNI_IDX  *tab_from_uni;
+  MY_UNICASE_INFO **caseinfo;
+  unsigned char     *state_map;
+  unsigned char     *ident_map;
+  uint32_t      strxfrm_multiply;
+  unsigned char     caseup_multiply;
+  unsigned char     casedn_multiply;
+  uint32_t      mbminlen;
+  uint32_t      mbmaxlen;
+  uint16_t    min_sort_char;
+  uint16_t    max_sort_char; /* For LIKE optimization */
+  unsigned char     pad_char;
+  bool   escape_with_backslash_is_dangerous;
+  unsigned char     levels_for_compare;
+  unsigned char     levels_for_order;
+
+  MY_CHARSET_HANDLER *cset;
+  MY_COLLATION_HANDLER *coll;
+
+};
 
 extern DRIZZLED_API charset_info_st *all_charsets[256];
 extern charset_info_st compiled_charsets[];
-
 extern uint32_t get_charset_number(const char *cs_name, uint32_t cs_flags);
 extern uint32_t get_collation_number(const char *name);
 extern const char *get_charset_name(uint32_t cs_number);
-
-DRIZZLED_API const charset_info_st *get_charset(uint32_t cs_number);
-DRIZZLED_API const charset_info_st *get_charset_by_name(const char *cs_name);
-DRIZZLED_API const charset_info_st *get_charset_by_csname(const char *cs_name, uint32_t cs_flags);
-
 extern bool resolve_charset(const char *cs_name,
 			    const charset_info_st *default_cs,
 			    const charset_info_st **cs);
 extern bool resolve_collation(const char *cl_name,
 			     const charset_info_st *default_cl,
 			     const charset_info_st **cl);
-
 extern void free_charsets(void);
 extern char *get_charsets_dir(char *buf);
 extern bool my_charset_same(const charset_info_st *cs1, const charset_info_st *cs2);
@@ -58,6 +331,546 @@
 extern size_t escape_quotes_for_drizzle(const charset_info_st *charset_info,
 					char *to, size_t to_length,
 					const char *from, size_t length);
+extern DRIZZLED_API const charset_info_st *default_charset_info;
+extern DRIZZLED_API const charset_info_st *system_charset_info;
+extern const charset_info_st *files_charset_info;
+extern const charset_info_st *table_alias_charset;
+extern MY_UNICASE_INFO *my_unicase_default[256];
+extern MY_UNICASE_INFO *my_unicase_turkish[256];
+extern MY_UNI_CTYPE my_uni_ctype[256];
+extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
+extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
+extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
+extern DRIZZLED_API charset_info_st my_charset_bin;
+extern DRIZZLED_API charset_info_st my_charset_utf8mb4_bin;
+extern DRIZZLED_API charset_info_st my_charset_utf8mb4_general_ci;
+extern DRIZZLED_API charset_info_st my_charset_utf8mb4_unicode_ci;
+size_t my_strnxfrmlen_simple(const charset_info_st * const, size_t);
+extern int  my_strnncollsp_simple(const charset_info_st * const, const unsigned char *, size_t,
+                                  const unsigned char *, size_t,
+                                  bool diff_if_only_endspace_difference);
+extern size_t my_lengthsp_8bit(const charset_info_st * const cs, const char *ptr, size_t length);
+extern uint32_t my_instr_simple(const charset_info_st * const,
+                            const char *b, size_t b_length,
+                            const char *s, size_t s_length,
+                            my_match_t *match, uint32_t nmatch);
+extern MY_CHARSET_HANDLER my_charset_8bit_handler;
+extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
+extern size_t my_caseup_str_mb(const charset_info_st * const, char *);
+extern size_t my_casedn_str_mb(const charset_info_st * const, char *);
+extern size_t my_caseup_mb(const charset_info_st * const, char *src, size_t srclen,
+                                         char *dst, size_t dstlen);
+extern size_t my_casedn_mb(const charset_info_st * const, char *src, size_t srclen,
+                                         char *dst, size_t dstlen);
+extern int my_strcasecmp_mb(const charset_info_st * const  cs, const char *s, const char *t);
+extern bool my_parse_charset_xml(const char *bug, size_t len,
+				    int (*add)(charset_info_st *cs));
+
+DRIZZLED_API const charset_info_st *get_charset(uint32_t cs_number);
+DRIZZLED_API const charset_info_st *get_charset_by_name(const char *cs_name);
+DRIZZLED_API const charset_info_st *get_charset_by_csname(const char *cs_name, uint32_t cs_flags);
+
+/* Functions for 8bit */
+int my_mb_ctype_8bit(const charset_info_st * const,int *, const unsigned char *,const unsigned char *);
+int my_mb_ctype_mb(const charset_info_st * const,int *, const unsigned char *,const unsigned char *);
+
+size_t my_scan_8bit(const charset_info_st * const cs, const char *b, const char *e, int sq);
+
+size_t my_snprintf_8bit(const charset_info_st * const, char *to, size_t n,
+                        const char *fmt, ...)
+  __attribute__((format(printf, 4, 5)));
+
+long       my_strntol_8bit(const charset_info_st * const, const char *s, size_t l, int base,
+                           char **e, int *err);
+unsigned long      my_strntoul_8bit(const charset_info_st * const, const char *s, size_t l, int base,
+			    char **e, int *err);
+int64_t   my_strntoll_8bit(const charset_info_st * const, const char *s, size_t l, int base,
+			    char **e, int *err);
+uint64_t my_strntoull_8bit(const charset_info_st * const, const char *s, size_t l, int base,
+			    char **e, int *err);
+double      my_strntod_8bit(const charset_info_st * const, char *s, size_t l,char **e,
+			    int *err);
+size_t my_long10_to_str_8bit(const charset_info_st * const, char *to, size_t l, int radix,
+                             long int val);
+size_t my_int64_t10_to_str_8bit(const charset_info_st * const, char *to, size_t l, int radix,
+                                 int64_t val);
+int64_t my_strtoll10_8bit(const charset_info_st * const cs,
+                           const char *nptr, char **endptr, int *error);
+int64_t my_strtoll10_ucs2(charset_info_st *cs,
+                           const char *nptr, char **endptr, int *error);
+
+uint64_t my_strntoull10rnd_8bit(const charset_info_st * const cs,
+                                 const char *str, size_t length, int
+                                 unsigned_fl, char **endptr, int *error);
+uint64_t my_strntoull10rnd_ucs2(charset_info_st *cs,
+                                 const char *str, size_t length,
+                                 int unsigned_fl, char **endptr, int *error);
+
+void my_fill_8bit(const charset_info_st * const cs, char* to, size_t l, int fill);
+
+bool  my_like_range_simple(const charset_info_st * const cs,
+			      const char *ptr, size_t ptr_length,
+			      char escape, char w_one, char w_many,
+			      size_t res_length,
+			      char *min_str, char *max_str,
+			      size_t *min_length, size_t *max_length);
+
+bool  my_like_range_mb(const charset_info_st * const cs,
+			  const char *ptr, size_t ptr_length,
+			  char escape, char w_one, char w_many,
+			  size_t res_length,
+			  char *min_str, char *max_str,
+			  size_t *min_length, size_t *max_length);
+
+bool  my_like_range_ucs2(const charset_info_st * const cs,
+			    const char *ptr, size_t ptr_length,
+			    char escape, char w_one, char w_many,
+			    size_t res_length,
+			    char *min_str, char *max_str,
+			    size_t *min_length, size_t *max_length);
+
+bool  my_like_range_utf16(const charset_info_st * const cs,
+			     const char *ptr, size_t ptr_length,
+			     char escape, char w_one, char w_many,
+			     size_t res_length,
+			     char *min_str, char *max_str,
+			     size_t *min_length, size_t *max_length);
+
+bool  my_like_range_utf32(const charset_info_st * const cs,
+			     const char *ptr, size_t ptr_length,
+			     char escape, char w_one, char w_many,
+			     size_t res_length,
+			     char *min_str, char *max_str,
+			     size_t *min_length, size_t *max_length);
+
+
+int my_wildcmp_8bit(const charset_info_st * const,
+		    const char *str,const char *str_end,
+		    const char *wildstr,const char *wildend,
+		    int escape, int w_one, int w_many);
+
+int my_wildcmp_bin(const charset_info_st * const,
+		   const char *str,const char *str_end,
+		   const char *wildstr,const char *wildend,
+		   int escape, int w_one, int w_many);
+
+size_t my_numchars_8bit(const charset_info_st * const, const char *b, const char *e);
+size_t my_numcells_8bit(const charset_info_st * const, const char *b, const char *e);
+size_t my_charpos_8bit(const charset_info_st * const, const char *b, const char *e, size_t pos);
+size_t my_well_formed_len_8bit(const charset_info_st * const, const char *b, const char *e,
+                             size_t pos, int *error);
+typedef unsigned char *(*cs_alloc_func)(size_t);
+bool my_coll_init_simple(charset_info_st *cs, cs_alloc_func alloc);
+bool my_cset_init_8bit(charset_info_st *cs, cs_alloc_func alloc);
+uint32_t my_mbcharlen_8bit(const charset_info_st * const, uint32_t c);
+
+/* Functions for multibyte charsets */
+int my_wildcmp_mb(const charset_info_st * const,
+		  const char *str,const char *str_end,
+		  const char *wildstr,const char *wildend,
+		  int escape, int w_one, int w_many);
+size_t my_numchars_mb(const charset_info_st * const, const char *b, const char *e);
+size_t my_numcells_mb(const charset_info_st * const, const char *b, const char *e);
+size_t my_charpos_mb(const charset_info_st * const, const char *b, const char *e, size_t pos);
+size_t my_well_formed_len_mb(const charset_info_st * const, const char *b, const char *e,
+                             size_t pos, int *error);
+uint32_t my_instr_mb(const charset_info_st * const,
+                 const char *b, size_t b_length,
+                 const char *s, size_t s_length,
+                 my_match_t *match, uint32_t nmatch);
+
+int my_strnncoll_mb_bin(const charset_info_st * const  cs,
+                        const unsigned char *s, size_t slen,
+                        const unsigned char *t, size_t tlen,
+                        bool t_is_prefix);
+
+int my_strnncollsp_mb_bin(const charset_info_st * const cs,
+                          const unsigned char *a, size_t a_length,
+                          const unsigned char *b, size_t b_length,
+                          bool diff_if_only_endspace_difference);
+
+int my_wildcmp_mb_bin(const charset_info_st * const cs,
+                      const char *str,const char *str_end,
+                      const char *wildstr,const char *wildend,
+                      int escape, int w_one, int w_many);
+
+int my_strcasecmp_mb_bin(const charset_info_st * const, const char *s, const char *t);
+
+void my_hash_sort_mb_bin(const charset_info_st * const,
+                         const unsigned char *key, size_t len, uint32_t *nr1, uint32_t *nr2);
+
+size_t my_strnxfrm_mb(const charset_info_st * const,
+                      unsigned char *dst, size_t dstlen, uint32_t nweights,
+                      const unsigned char *src, size_t srclen, uint32_t flags);
+
+int my_wildcmp_unicode(const charset_info_st * const cs,
+                       const char *str, const char *str_end,
+                       const char *wildstr, const char *wildend,
+                       int escape, int w_one, int w_many,
+                       MY_UNICASE_INFO **weights);
+
+bool my_propagate_simple(const charset_info_st * const cs, const unsigned char *str, size_t len);
+bool my_propagate_complex(const charset_info_st * const cs, const unsigned char *str, size_t len);
+
+
+uint32_t my_strxfrm_flag_normalize(uint32_t flags, uint32_t nlevels);
+void my_strxfrm_desc_and_reverse(unsigned char *str, unsigned char *strend,
+                                 uint32_t flags, uint32_t level);
+size_t my_strxfrm_pad_desc_and_reverse(const charset_info_st * const cs,
+                                       unsigned char *str, unsigned char *frmend, unsigned char *strend,
+                                       uint32_t nweights, uint32_t flags, uint32_t level);
+
+bool my_charset_is_ascii_compatible(const charset_info_st * const cs);
+
+/*
+  Compare 0-terminated UTF8 strings.
+
+  SYNOPSIS
+    my_strcasecmp_utf8mb3()
+    cs                  character set handler
+    s                   First 0-terminated string to compare
+    t                   Second 0-terminated string to compare
+
+  IMPLEMENTATION
+
+  RETURN
+    - negative number if s < t
+    - positive number if s > t
+    - 0 is the strings are equal
+*/
+int my_wc_mb_filename(const charset_info_st * const,
+                  my_wc_t wc, unsigned char *s, unsigned char *e);
+
+int my_mb_wc_filename(const charset_info_st * const,
+                  my_wc_t *pwc, const unsigned char *s, const unsigned char *e);
+
+
+unsigned int my_ismbchar_utf8mb4(const charset_info_st * const cs, const char *b, const char *e);
+unsigned int my_mbcharlen_utf8mb4(const charset_info_st * const, uint32_t c);
+
+size_t my_strnxfrmlen_utf8mb4(const charset_info_st * const, size_t len);
+size_t
+my_strnxfrm_utf8mb4(const charset_info_st * const cs,
+                    unsigned char *dst, size_t dstlen, uint32_t nweights,
+                    const unsigned char *src, size_t srclen, uint32_t flags);
+
+int my_wildcmp_utf8mb4(const charset_info_st * const cs,
+                   const char *str, const char *strend,
+                   const char *wildstr, const char *wildend,
+                   int escape, int w_one, int w_many);
+int my_strnncollsp_utf8mb4(const charset_info_st * const cs,
+                       const unsigned char *s, size_t slen,
+                       const unsigned char *t, size_t tlen,
+                       bool diff_if_only_endspace_difference);
+int my_strcasecmp_utf8mb4(const charset_info_st * const cs,
+                          const char *s, const char *t);
+
+int my_strnncoll_utf8mb4(const charset_info_st * const cs,
+                     const unsigned char *s, size_t slen,
+                     const unsigned char *t, size_t tlen,
+                     bool t_is_prefix);
+
+int my_mb_wc_utf8mb4(const charset_info_st * const cs,
+                 my_wc_t * pwc, const unsigned char *s, const unsigned char *e);
+
+int my_wc_mb_utf8mb4(const charset_info_st * const cs,
+                 my_wc_t wc, unsigned char *r, unsigned char *e);
+
+size_t my_caseup_str_utf8mb4(const charset_info_st * const cs, char *src);
+size_t my_casedn_str_utf8mb4(const charset_info_st * const cs, char *src);
+
+size_t my_caseup_utf8mb4(const charset_info_st * const cs, char *src, size_t srclen,
+                  char *dst, size_t dstlen);
+size_t my_casedn_utf8mb4(const charset_info_st * const cs,
+                  char *src, size_t srclen,
+                  char *dst, size_t dstlen);
+
+
+bool my_coll_init_uca(charset_info_st *cs, cs_alloc_func alloc);
+
+int my_strnncoll_any_uca(const charset_info_st * const cs,
+                         const unsigned char *s, size_t slen,
+                         const unsigned char *t, size_t tlen,
+                         bool t_is_prefix);
+
+int my_strnncollsp_any_uca(const charset_info_st * const cs,
+                           const unsigned char *s, size_t slen,
+                           const unsigned char *t, size_t tlen,
+                           bool diff_if_only_endspace_difference);
+
+void my_hash_sort_any_uca(const charset_info_st * const cs,
+                          const unsigned char *s, size_t slen,
+                          uint32_t *n1, uint32_t *n2);
+
+size_t my_strnxfrm_any_uca(const charset_info_st * const cs,
+                           unsigned char *dst, size_t dstlen, uint32_t nweights,
+                           const unsigned char *src, size_t srclen,
+                           uint32_t flags);
+
+int my_wildcmp_uca(const charset_info_st * const cs,
+                   const char *str,const char *str_end,
+                   const char *wildstr,const char *wildend,
+                   int escape, int w_one, int w_many);
+
+int my_strnncoll_8bit_bin(const charset_info_st * const,
+                          const unsigned char *s, size_t slen,
+                          const unsigned char *t, size_t tlen,
+                          bool t_is_prefix);
+int my_strnncollsp_8bit_bin(const charset_info_st * const,
+                            const unsigned char *a, size_t a_length,
+                            const unsigned char *b, size_t b_length,
+                            bool diff_if_only_endspace_difference);
+size_t my_case_str_bin(const charset_info_st * const, char *);
+size_t my_case_bin(const charset_info_st * const, char *,
+                   size_t srclen, char *, size_t);
+int my_strcasecmp_bin(const charset_info_st * const,
+                      const char *s, const char *t);
+size_t my_strnxfrm_8bit_bin(const charset_info_st * const cs,
+                     unsigned char * dst, size_t dstlen, uint32_t nweights,
+                     const unsigned char *src, size_t srclen, uint32_t flags);
+uint32_t my_instr_bin(const charset_info_st * const,
+                      const char *b, size_t b_length,
+                      const char *s, size_t s_length,
+                      my_match_t *match, uint32_t nmatch);
+size_t my_lengthsp_binary(const charset_info_st * const,
+                          const char *, size_t length);
+int my_mb_wc_bin(const charset_info_st * const,
+                 my_wc_t *wc, const unsigned char *str,
+                 const unsigned char *end);
+int my_wc_mb_bin(const charset_info_st * const, my_wc_t wc,
+                 unsigned char *str, unsigned char *end);
+void my_hash_sort_8bit_bin(const charset_info_st * const,
+                           const unsigned char *key, size_t len,
+                           uint32_t *nr1, uint32_t *nr2);
+bool my_coll_init_8bit_bin(charset_info_st *cs,
+                           cs_alloc_func);
+int my_strnncoll_binary(const charset_info_st * const,
+                        const unsigned char *s, size_t slen,
+                        const unsigned char *t, size_t tlen,
+                        bool t_is_prefix);
+int my_strnncollsp_binary(const charset_info_st * const cs,
+                          const unsigned char *s, size_t slen,
+                          const unsigned char *t, size_t tlen,
+                          bool);
+
+inline static bool my_isascii(char c)      
+{
+  return (!(c & ~0177));
+}
+
+inline static char my_toascii(char c)
+{
+  return (c & 0177);
+}
+
+inline static char my_tocntrl(char c) 
+{
+  return (c & 31);
+}
+
+inline static char my_toprint(char c)
+{
+  return (c | 64);
+}
+
+inline static char my_toupper(const charset_info_st *s, unsigned char c)
+{
+  return s->to_upper[c];
+}
+
+inline static char my_tolower(const charset_info_st *s, unsigned char c)
+{
+  return s->to_lower[c];
+}
+
+inline static bool my_isalpha(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & (_MY_U | _MY_L);
+}
+
+inline static bool my_isupper(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & _MY_U;
+}
+
+inline static bool my_islower(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & _MY_L;
+}
+
+inline static bool my_isdigit(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & _MY_NMR;
+}
+
+inline static bool my_isxdigit(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & _MY_X;
+}
+
+inline static bool my_isalnum(const charset_info_st *s, unsigned char c) 
+{
+  return (s->ctype+1)[c] & (_MY_U | _MY_L | _MY_NMR);
+}
+
+inline static bool my_isspace(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & _MY_SPC;
+}
+
+inline static bool my_ispunct(const charset_info_st *s, unsigned char c)  
+{
+  return (s->ctype+1)[c] & _MY_PNT;
+}
+
+inline static bool my_isprint(const charset_info_st *s, unsigned char c)  
+{
+  return (s->ctype+1)[c] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B);
+}
+
+inline static bool my_isgraph(const charset_info_st *s, unsigned char c)
+{
+  return (s->ctype+1)[c] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR);
+}
+
+inline static bool my_iscntrl(const charset_info_st *s, unsigned char c)  
+{
+  return (s->ctype+1)[c] & _MY_CTR;
+}
+
+/* Some macros that should be cleaned up a little */
+inline static bool my_isvar(const charset_info_st *s, char c)
+{
+  return my_isalnum(s,c) || (c) == '_';
+}
+
+inline static bool my_isvar_start(const charset_info_st *s, char c)
+{
+  return my_isalpha(s,c) || (c) == '_';
+}
+
+inline static bool my_binary_compare(const charset_info_st *s)
+{
+  return s->state  & MY_CS_BINSORT;
+}
+
+inline static bool use_strnxfrm(const charset_info_st *s)
+{
+  return s->state & MY_CS_STRNXFRM;
+}
+
+inline static size_t my_strnxfrm(const charset_info_st *cs, 
+                                 unsigned char *dst, 
+                                 const size_t dstlen, 
+                                 const unsigned char *src, 
+                                 const uint32_t srclen)
+{
+  return (cs->coll->strnxfrm(cs, dst, dstlen, dstlen, src, srclen, MY_STRXFRM_PAD_WITH_SPACE));
+}
+
+inline static int my_strnncoll(const charset_info_st *cs, 
+                               const unsigned char *s, 
+                               const size_t slen, 
+                               const unsigned char *t,
+                               const size_t tlen) 
+{
+  return (cs->coll->strnncoll(cs, s, slen, t, tlen, 0));
+}
+
+inline static bool my_like_range(const charset_info_st *cs,
+                                 const char *ptr, const size_t ptrlen,
+                                 const char escape, 
+                                 const char w_one,
+                                 const char w_many, 
+                                 const size_t reslen, 
+                                 char *minstr, char *maxstr, 
+                                 size_t *minlen, size_t *maxlen)
+{
+  return (cs->coll->like_range(cs, ptr, ptrlen, escape, w_one, w_many, reslen, 
+                               minstr, maxstr, minlen, maxlen));
+}
+
+inline static int my_wildcmp(const charset_info_st *cs,
+                             const char *str, const char *strend,
+                             const char *w_str, const char *w_strend,
+                             const int escape,
+                             const int w_one, const int w_many) 
+{
+  return (cs->coll->wildcmp(cs, str, strend, w_str, w_strend, escape, w_one, w_many));
+}
+
+inline static int my_strcasecmp(const charset_info_st *cs, const char *s, const char *t)
+{
+  return (cs->coll->strcasecmp(cs, s, t));
+}
+
+template <typename CHAR_T>
+inline static size_t my_charpos(const charset_info_st *cs, 
+                                const CHAR_T *b, const CHAR_T* e, size_t num)
+{
+  return cs->cset->charpos(cs, reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(e), num);
+}
+
+inline static bool use_mb(const charset_info_st *cs)
+{
+  return cs->cset->ismbchar != NULL;
+}
+
+inline static unsigned int  my_ismbchar(const charset_info_st *cs, const char *a, const char *b)
+{
+  return cs->cset->ismbchar(cs, a, b);
+}
+
+inline static unsigned int my_mbcharlen(const charset_info_st *cs, uint32_t c)
+{
+  return cs->cset->mbcharlen(cs, c);
+}
+
+
+inline static size_t my_caseup_str(const charset_info_st *cs, char *src)
+{
+  return cs->cset->caseup_str(cs, src);
+}
+
+inline static size_t my_casedn_str(const charset_info_st *cs, char *src)
+{
+  return cs->cset->casedn_str(cs, src);
+}
+
+inline static long my_strntol(const charset_info_st *cs, 
+                              const char* s, const size_t l, const int base, char **e, int *err)
+{
+  return (cs->cset->strntol(cs, s, l, base, e, err));
+}
+
+inline static unsigned long my_strntoul(const charset_info_st *cs, 
+                                        const char* s, const size_t l, const int base, 
+                                        char **e, int *err)
+{
+  return (cs->cset->strntoul(cs, s, l, base, e, err));
+}
+
+inline static int64_t my_strntoll(const charset_info_st *cs, 
+                                 const char* s, const size_t l, const int base, char **e, int *err)
+{
+  return (cs->cset->strntoll(cs, s, l, base, e, err));
+}
+
+inline static int64_t my_strntoull(const charset_info_st *cs, 
+                                   const char* s, const size_t l, const int base, 
+                                   char **e, int *err)
+{
+  return (cs->cset->strntoull(cs, s, l, base, e, err));
+}
+
+
+inline static double my_strntod(const charset_info_st *cs, 
+                                char* s, const size_t l, char **e, int *err)
+{
+  return (cs->cset->strntod(cs, s, l, e, err));
+}
+
+int make_escape_code(const charset_info_st * const cs, const char *escape);
 
 } /* namespace drizzled */
 

=== removed file 'drizzled/charset_info.h'
--- drizzled/charset_info.h	2011-04-16 12:24:04 +0000
+++ drizzled/charset_info.h	1970-01-01 00:00:00 +0000
@@ -1,886 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-/*
-  A better inplementation of the UNIX ctype(3) library.
-*/
-
-#pragma once
-
-#include <sys/types.h>
-#include <cstddef>
-
-#include <drizzled/visibility.h>
-
-namespace drizzled
-{
-
-#define MY_CS_NAME_SIZE			32
-#define MY_CS_CTYPE_TABLE_SIZE		257
-#define MY_CS_TO_LOWER_TABLE_SIZE	256
-#define MY_CS_TO_UPPER_TABLE_SIZE	256
-#define MY_CS_SORT_ORDER_TABLE_SIZE	256
-#define MY_CS_TO_UNI_TABLE_SIZE		256
-
-#define CHARSET_DIR	"charsets/"
-
-#define my_wc_t unsigned long
-
-typedef struct unicase_info_st
-{
-  uint16_t toupper;
-  uint16_t tolower;
-  uint16_t sort;
-} MY_UNICASE_INFO;
-
-
-extern MY_UNICASE_INFO *my_unicase_default[256];
-extern MY_UNICASE_INFO *my_unicase_turkish[256];
-
-typedef struct uni_ctype_st
-{
-  unsigned char  pctype;
-  unsigned char  *ctype;
-} MY_UNI_CTYPE;
-
-extern MY_UNI_CTYPE my_uni_ctype[256];
-
-/* wm_wc and wc_mb return codes */
-#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */
-#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */
-#define MY_CS_TOOSMALL  -101  /* Need at least one byte:    wc_mb and mb_wc */
-#define MY_CS_TOOSMALL2 -102  /* Need at least two bytes:   wc_mb and mb_wc */
-#define MY_CS_TOOSMALL3 -103  /* Need at least three bytes: wc_mb and mb_wc */
-/* These following three are currently not really used */
-#define MY_CS_TOOSMALL4 -104  /* Need at least 4 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL5 -105  /* Need at least 5 bytes: wc_mb and mb_wc */
-#define MY_CS_TOOSMALL6 -106  /* Need at least 6 bytes: wc_mb and mb_wc */
-
-/* A helper function for "need at least n bytes" */
-inline static int my_cs_toosmalln(int n)
-{
-  return -100-n;
-}
-
-#define MY_SEQ_INTTAIL	1
-#define MY_SEQ_SPACES	2
-
-        /* My charsets_list flags */
-#define MY_CS_COMPILED  1      /* compiled-in sets               */
-#define MY_CS_CONFIG    2      /* sets that have a *.conf file   */
-#define MY_CS_INDEX     4      /* sets listed in the Index file  */
-#define MY_CS_LOADED    8      /* sets that are currently loaded */
-#define MY_CS_BINSORT	16     /* if binary sort order           */
-#define MY_CS_PRIMARY	32     /* if primary collation           */
-#define MY_CS_STRNXFRM	64     /* if strnxfrm is used for sort   */
-#define MY_CS_UNICODE	128    /* is a charset is full unicode   */
-#define MY_CS_READY	256    /* if a charset is initialized    */
-#define MY_CS_AVAILABLE	512    /* If either compiled-in or loaded*/
-#define MY_CS_CSSORT	1024   /* if case sensitive sort order   */
-#define MY_CS_HIDDEN	2048   /* don't display in SHOW          */
-#define MY_CS_NONASCII  8192   /* if not ASCII-compatible        */
-#define MY_CHARSET_UNDEFINED 0
-
-/* Flags for strxfrm */
-#define MY_STRXFRM_LEVEL1          0x00000001 /* for primary weights   */
-#define MY_STRXFRM_LEVEL2          0x00000002 /* for secondary weights */
-#define MY_STRXFRM_LEVEL3          0x00000004 /* for tertiary weights  */
-#define MY_STRXFRM_LEVEL4          0x00000008 /* fourth level weights  */
-#define MY_STRXFRM_LEVEL5          0x00000010 /* fifth level weights   */
-#define MY_STRXFRM_LEVEL6          0x00000020 /* sixth level weights   */
-#define MY_STRXFRM_LEVEL_ALL       0x0000003F /* Bit OR for the above six */
-#define MY_STRXFRM_NLEVELS         6          /* Number of possible levels*/
-
-#define MY_STRXFRM_PAD_WITH_SPACE  0x00000040 /* if pad result with spaces */
-#define MY_STRXFRM_UNUSED_00000080 0x00000080 /* for future extensions     */
-
-#define MY_STRXFRM_DESC_LEVEL1     0x00000100 /* if desc order for level1 */
-#define MY_STRXFRM_DESC_LEVEL2     0x00000200 /* if desc order for level2 */
-#define MY_STRXFRM_DESC_LEVEL3     0x00000300 /* if desc order for level3 */
-#define MY_STRXFRM_DESC_LEVEL4     0x00000800 /* if desc order for level4 */
-#define MY_STRXFRM_DESC_LEVEL5     0x00001000 /* if desc order for level5 */
-#define MY_STRXFRM_DESC_LEVEL6     0x00002000 /* if desc order for level6 */
-#define MY_STRXFRM_DESC_SHIFT      8
-
-#define MY_STRXFRM_UNUSED_00004000 0x00004000 /* for future extensions     */
-#define MY_STRXFRM_UNUSED_00008000 0x00008000 /* for future extensions     */
-
-#define MY_STRXFRM_REVERSE_LEVEL1  0x00010000 /* if reverse order for level1 */
-#define MY_STRXFRM_REVERSE_LEVEL2  0x00020000 /* if reverse order for level2 */
-#define MY_STRXFRM_REVERSE_LEVEL3  0x00040000 /* if reverse order for level3 */
-#define MY_STRXFRM_REVERSE_LEVEL4  0x00080000 /* if reverse order for level4 */
-#define MY_STRXFRM_REVERSE_LEVEL5  0x00100000 /* if reverse order for level5 */
-#define MY_STRXFRM_REVERSE_LEVEL6  0x00200000 /* if reverse order for level6 */
-#define MY_STRXFRM_REVERSE_SHIFT   16
-
-
-typedef struct my_uni_idx_st
-{
-  uint16_t from;
-  uint16_t to;
-  unsigned char  *tab;
-} MY_UNI_IDX;
-
-typedef struct
-{
-  uint32_t beg;
-  uint32_t end;
-  uint32_t mb_len;
-} my_match_t;
-
-enum my_lex_states
-{
-  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT,
-  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,
-  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,
-  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,
-  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,
-  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,
-  MY_LEX_LONG_COMMENT, MY_LEX_END_LONG_COMMENT, MY_LEX_SEMICOLON,
-  MY_LEX_SET_VAR, MY_LEX_USER_END, MY_LEX_HOSTNAME, MY_LEX_SKIP,
-  MY_LEX_USER_VARIABLE_DELIMITER, MY_LEX_SYSTEM_VAR,
-  MY_LEX_IDENT_OR_KEYWORD,
-  MY_LEX_IDENT_OR_HEX, MY_LEX_IDENT_OR_BIN,
-  MY_LEX_STRING_OR_DELIMITER
-};
-
-struct charset_info_st;
-
-
-/* See strings/charset_info_st.txt for information about this structure  */
-typedef struct my_collation_handler_st
-{
-  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
-  /* Collation routines */
-  int     (*strnncoll)(const struct charset_info_st * const,
-		       const unsigned char *, size_t, const unsigned char *, size_t, bool);
-  int     (*strnncollsp)(const struct charset_info_st * const,
-                         const unsigned char *, size_t, const unsigned char *, size_t,
-                         bool diff_if_only_endspace_difference);
-  size_t  (*strnxfrm)(const struct charset_info_st * const,
-                      unsigned char *dst, size_t dstlen, uint32_t nweights,
-                      const unsigned char *src, size_t srclen, uint32_t flags);
-  size_t    (*strnxfrmlen)(const struct charset_info_st * const, size_t);
-  bool (*like_range)(const struct charset_info_st * const,
-                        const char *s, size_t s_length,
-                        char escape, char w_one, char w_many,
-                        size_t res_length,
-                        char *min_str, char *max_str,
-                        size_t *min_len, size_t *max_len);
-  int     (*wildcmp)(const struct charset_info_st * const,
-  		     const char *str,const char *str_end,
-                     const char *wildstr,const char *wildend,
-                     int escape,int w_one, int w_many);
-
-  int  (*strcasecmp)(const struct charset_info_st * const, const char *, const char *);
-
-  uint32_t (*instr)(const struct charset_info_st * const,
-                const char *b, size_t b_length,
-                const char *s, size_t s_length,
-                my_match_t *match, uint32_t nmatch);
-
-  /* Hash calculation */
-  void (*hash_sort)(const struct charset_info_st *cs, const unsigned char *key, size_t len,
-                    uint32_t *nr1, uint32_t *nr2);
-  bool (*propagate)(const struct charset_info_st *cs, const unsigned char *str, size_t len);
-} MY_COLLATION_HANDLER;
-
-extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
-extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
-extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
-
-/* Some typedef to make it easy for C++ to make function pointers */
-typedef int (*my_charset_conv_mb_wc)(const struct charset_info_st * const, my_wc_t *,
-                                     const unsigned char *, const unsigned char *);
-typedef int (*my_charset_conv_wc_mb)(const struct charset_info_st * const, my_wc_t,
-                                     unsigned char *, unsigned char *);
-typedef size_t (*my_charset_conv_case)(const struct charset_info_st * const,
-                                       char *, size_t, char *, size_t);
-
-
-/* See strings/charset_info_st.txt about information on this structure  */
-typedef struct my_charset_handler_st
-{
-  bool (*init)(struct charset_info_st *, unsigned char *(*alloc)(size_t));
-  /* Multibyte routines */
-  uint32_t    (*ismbchar)(const struct charset_info_st * const, const char *, const char *);
-  uint32_t    (*mbcharlen)(const struct charset_info_st * const, uint32_t c);
-  size_t  (*numchars)(const struct charset_info_st * const, const char *b, const char *e);
-  size_t  (*charpos)(const struct charset_info_st * const, const char *b, const char *e,
-                     size_t pos);
-  size_t  (*well_formed_len)(const struct charset_info_st * const,
-                             const char *b,const char *e,
-                             size_t nchars, int *error);
-  size_t  (*lengthsp)(const struct charset_info_st * const, const char *ptr, size_t length);
-  size_t  (*numcells)(const struct charset_info_st * const, const char *b, const char *e);
-
-  /* Unicode conversion */
-  my_charset_conv_mb_wc mb_wc;
-  my_charset_conv_wc_mb wc_mb;
-
-  /* CTYPE scanner */
-  int (*ctype)(const struct charset_info_st *cs, int *ctype,
-               const unsigned char *s, const unsigned char *e);
-
-  /* Functions for case and sort conversion */
-  size_t  (*caseup_str)(const struct charset_info_st * const, char *);
-  size_t  (*casedn_str)(const struct charset_info_st * const, char *);
-
-  my_charset_conv_case caseup;
-  my_charset_conv_case casedn;
-
-  /* Charset dependant snprintf() */
-  size_t (*snprintf)(const struct charset_info_st * const, char *to, size_t n,
-                     const char *fmt,
-                     ...)
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-                         __attribute__((format(printf, 4, 5)))
-#endif
-                         ;
-  size_t (*long10_to_str)(const struct charset_info_st * const, char *to, size_t n,
-                          int radix, long int val);
-  size_t (*int64_t10_to_str)(const struct charset_info_st * const, char *to, size_t n,
-                              int radix, int64_t val);
-
-  void (*fill)(const struct charset_info_st * const, char *to, size_t len, int fill);
-
-  /* String-to-number conversion routines */
-  long        (*strntol)(const struct charset_info_st * const, const char *s, size_t l,
-			 int base, char **e, int *err);
-  unsigned long      (*strntoul)(const struct charset_info_st * const, const char *s, size_t l,
-			 int base, char **e, int *err);
-  int64_t   (*strntoll)(const struct charset_info_st * const, const char *s, size_t l,
-			 int base, char **e, int *err);
-  uint64_t (*strntoull)(const struct charset_info_st * const, const char *s, size_t l,
-			 int base, char **e, int *err);
-  double      (*strntod)(const struct charset_info_st * const, char *s, size_t l, char **e,
-			 int *err);
-  int64_t    (*strtoll10)(const struct charset_info_st *cs,
-                           const char *nptr, char **endptr, int *error);
-  uint64_t   (*strntoull10rnd)(const struct charset_info_st *cs,
-                                const char *str, size_t length,
-                                int unsigned_fl,
-                                char **endptr, int *error);
-  size_t        (*scan)(const struct charset_info_st * const, const char *b, const char *e,
-                        int sq);
-} MY_CHARSET_HANDLER;
-
-extern MY_CHARSET_HANDLER my_charset_8bit_handler;
-extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
-
-
-/* See strings/charset_info_st.txt about information on this structure  */
-struct charset_info_st
-{
-  uint32_t      number;
-  uint32_t      primary_number;
-  uint32_t      binary_number;
-  uint32_t      state;
-  const char *csname;
-  const char *name;
-  const char *comment;
-  const char *tailoring;
-  unsigned char    *ctype;
-  unsigned char    *to_lower;
-  unsigned char    *to_upper;
-  unsigned char    *sort_order;
-  uint16_t   *contractions;
-  uint16_t   **sort_order_big;
-  uint16_t      *tab_to_uni;
-  MY_UNI_IDX  *tab_from_uni;
-  MY_UNICASE_INFO **caseinfo;
-  unsigned char     *state_map;
-  unsigned char     *ident_map;
-  uint32_t      strxfrm_multiply;
-  unsigned char     caseup_multiply;
-  unsigned char     casedn_multiply;
-  uint32_t      mbminlen;
-  uint32_t      mbmaxlen;
-  uint16_t    min_sort_char;
-  uint16_t    max_sort_char; /* For LIKE optimization */
-  unsigned char     pad_char;
-  bool   escape_with_backslash_is_dangerous;
-  unsigned char     levels_for_compare;
-  unsigned char     levels_for_order;
-
-  MY_CHARSET_HANDLER *cset;
-  MY_COLLATION_HANDLER *coll;
-
-};
-
-#define ILLEGAL_CHARSET_INFO_NUMBER (UINT32_MAX)
-
-
-extern DRIZZLED_API charset_info_st my_charset_bin;
-extern DRIZZLED_API charset_info_st my_charset_utf8mb4_bin;
-extern DRIZZLED_API charset_info_st my_charset_utf8mb4_general_ci;
-extern DRIZZLED_API charset_info_st my_charset_utf8mb4_unicode_ci;
-
-#define MY_UTF8MB4                 "utf8"
-#define my_charset_utf8_general_ci ::drizzled::my_charset_utf8mb4_general_ci
-#define my_charset_utf8_bin        ::drizzled::my_charset_utf8mb4_bin
-
-
-/* declarations for simple charsets */
-size_t my_strnxfrmlen_simple(const charset_info_st * const, size_t);
-
-extern int  my_strnncollsp_simple(const charset_info_st * const, const unsigned char *, size_t,
-                                  const unsigned char *, size_t,
-                                  bool diff_if_only_endspace_difference);
-
-extern size_t my_lengthsp_8bit(const charset_info_st * const cs, const char *ptr, size_t length);
-
-extern uint32_t my_instr_simple(const charset_info_st * const,
-                            const char *b, size_t b_length,
-                            const char *s, size_t s_length,
-                            my_match_t *match, uint32_t nmatch);
-
-
-/* Functions for 8bit */
-int my_mb_ctype_8bit(const charset_info_st * const,int *, const unsigned char *,const unsigned char *);
-int my_mb_ctype_mb(const charset_info_st * const,int *, const unsigned char *,const unsigned char *);
-
-size_t my_scan_8bit(const charset_info_st * const cs, const char *b, const char *e, int sq);
-
-size_t my_snprintf_8bit(const charset_info_st * const, char *to, size_t n,
-                        const char *fmt, ...)
-  __attribute__((format(printf, 4, 5)));
-
-long       my_strntol_8bit(const charset_info_st * const, const char *s, size_t l, int base,
-                           char **e, int *err);
-unsigned long      my_strntoul_8bit(const charset_info_st * const, const char *s, size_t l, int base,
-			    char **e, int *err);
-int64_t   my_strntoll_8bit(const charset_info_st * const, const char *s, size_t l, int base,
-			    char **e, int *err);
-uint64_t my_strntoull_8bit(const charset_info_st * const, const char *s, size_t l, int base,
-			    char **e, int *err);
-double      my_strntod_8bit(const charset_info_st * const, char *s, size_t l,char **e,
-			    int *err);
-size_t my_long10_to_str_8bit(const charset_info_st * const, char *to, size_t l, int radix,
-                             long int val);
-size_t my_int64_t10_to_str_8bit(const charset_info_st * const, char *to, size_t l, int radix,
-                                 int64_t val);
-
-int64_t my_strtoll10_8bit(const charset_info_st * const cs,
-                           const char *nptr, char **endptr, int *error);
-int64_t my_strtoll10_ucs2(charset_info_st *cs,
-                           const char *nptr, char **endptr, int *error);
-
-uint64_t my_strntoull10rnd_8bit(const charset_info_st * const cs,
-                                 const char *str, size_t length, int
-                                 unsigned_fl, char **endptr, int *error);
-uint64_t my_strntoull10rnd_ucs2(charset_info_st *cs,
-                                 const char *str, size_t length,
-                                 int unsigned_fl, char **endptr, int *error);
-
-void my_fill_8bit(const charset_info_st * const cs, char* to, size_t l, int fill);
-
-bool  my_like_range_simple(const charset_info_st * const cs,
-			      const char *ptr, size_t ptr_length,
-			      char escape, char w_one, char w_many,
-			      size_t res_length,
-			      char *min_str, char *max_str,
-			      size_t *min_length, size_t *max_length);
-
-bool  my_like_range_mb(const charset_info_st * const cs,
-			  const char *ptr, size_t ptr_length,
-			  char escape, char w_one, char w_many,
-			  size_t res_length,
-			  char *min_str, char *max_str,
-			  size_t *min_length, size_t *max_length);
-
-bool  my_like_range_ucs2(const charset_info_st * const cs,
-			    const char *ptr, size_t ptr_length,
-			    char escape, char w_one, char w_many,
-			    size_t res_length,
-			    char *min_str, char *max_str,
-			    size_t *min_length, size_t *max_length);
-
-bool  my_like_range_utf16(const charset_info_st * const cs,
-			     const char *ptr, size_t ptr_length,
-			     char escape, char w_one, char w_many,
-			     size_t res_length,
-			     char *min_str, char *max_str,
-			     size_t *min_length, size_t *max_length);
-
-bool  my_like_range_utf32(const charset_info_st * const cs,
-			     const char *ptr, size_t ptr_length,
-			     char escape, char w_one, char w_many,
-			     size_t res_length,
-			     char *min_str, char *max_str,
-			     size_t *min_length, size_t *max_length);
-
-
-int my_wildcmp_8bit(const charset_info_st * const,
-		    const char *str,const char *str_end,
-		    const char *wildstr,const char *wildend,
-		    int escape, int w_one, int w_many);
-
-int my_wildcmp_bin(const charset_info_st * const,
-		   const char *str,const char *str_end,
-		   const char *wildstr,const char *wildend,
-		   int escape, int w_one, int w_many);
-
-size_t my_numchars_8bit(const charset_info_st * const, const char *b, const char *e);
-size_t my_numcells_8bit(const charset_info_st * const, const char *b, const char *e);
-size_t my_charpos_8bit(const charset_info_st * const, const char *b, const char *e, size_t pos);
-size_t my_well_formed_len_8bit(const charset_info_st * const, const char *b, const char *e,
-                             size_t pos, int *error);
-typedef unsigned char *(*cs_alloc_func)(size_t);
-bool my_coll_init_simple(charset_info_st *cs, cs_alloc_func alloc);
-bool my_cset_init_8bit(charset_info_st *cs, cs_alloc_func alloc);
-uint32_t my_mbcharlen_8bit(const charset_info_st * const, uint32_t c);
-
-
-/* Functions for multibyte charsets */
-extern size_t my_caseup_str_mb(const charset_info_st * const, char *);
-extern size_t my_casedn_str_mb(const charset_info_st * const, char *);
-extern size_t my_caseup_mb(const charset_info_st * const, char *src, size_t srclen,
-                                         char *dst, size_t dstlen);
-extern size_t my_casedn_mb(const charset_info_st * const, char *src, size_t srclen,
-                                         char *dst, size_t dstlen);
-extern int my_strcasecmp_mb(const charset_info_st * const  cs, const char *s, const char *t);
-
-int my_wildcmp_mb(const charset_info_st * const,
-		  const char *str,const char *str_end,
-		  const char *wildstr,const char *wildend,
-		  int escape, int w_one, int w_many);
-size_t my_numchars_mb(const charset_info_st * const, const char *b, const char *e);
-size_t my_numcells_mb(const charset_info_st * const, const char *b, const char *e);
-size_t my_charpos_mb(const charset_info_st * const, const char *b, const char *e, size_t pos);
-size_t my_well_formed_len_mb(const charset_info_st * const, const char *b, const char *e,
-                             size_t pos, int *error);
-uint32_t my_instr_mb(const charset_info_st * const,
-                 const char *b, size_t b_length,
-                 const char *s, size_t s_length,
-                 my_match_t *match, uint32_t nmatch);
-
-int my_strnncoll_mb_bin(const charset_info_st * const  cs,
-                        const unsigned char *s, size_t slen,
-                        const unsigned char *t, size_t tlen,
-                        bool t_is_prefix);
-
-int my_strnncollsp_mb_bin(const charset_info_st * const cs,
-                          const unsigned char *a, size_t a_length,
-                          const unsigned char *b, size_t b_length,
-                          bool diff_if_only_endspace_difference);
-
-int my_wildcmp_mb_bin(const charset_info_st * const cs,
-                      const char *str,const char *str_end,
-                      const char *wildstr,const char *wildend,
-                      int escape, int w_one, int w_many);
-
-int my_strcasecmp_mb_bin(const charset_info_st * const, const char *s, const char *t);
-
-void my_hash_sort_mb_bin(const charset_info_st * const,
-                         const unsigned char *key, size_t len, uint32_t *nr1, uint32_t *nr2);
-
-size_t my_strnxfrm_mb(const charset_info_st * const,
-                      unsigned char *dst, size_t dstlen, uint32_t nweights,
-                      const unsigned char *src, size_t srclen, uint32_t flags);
-
-int my_wildcmp_unicode(const charset_info_st * const cs,
-                       const char *str, const char *str_end,
-                       const char *wildstr, const char *wildend,
-                       int escape, int w_one, int w_many,
-                       MY_UNICASE_INFO **weights);
-
-extern bool my_parse_charset_xml(const char *bug, size_t len,
-				    int (*add)(charset_info_st *cs));
-
-bool my_propagate_simple(const charset_info_st * const cs, const unsigned char *str, size_t len);
-bool my_propagate_complex(const charset_info_st * const cs, const unsigned char *str, size_t len);
-
-
-uint32_t my_strxfrm_flag_normalize(uint32_t flags, uint32_t nlevels);
-void my_strxfrm_desc_and_reverse(unsigned char *str, unsigned char *strend,
-                                 uint32_t flags, uint32_t level);
-size_t my_strxfrm_pad_desc_and_reverse(const charset_info_st * const cs,
-                                       unsigned char *str, unsigned char *frmend, unsigned char *strend,
-                                       uint32_t nweights, uint32_t flags, uint32_t level);
-
-bool my_charset_is_ascii_compatible(const charset_info_st * const cs);
-
-/*
-  Compare 0-terminated UTF8 strings.
-
-  SYNOPSIS
-    my_strcasecmp_utf8mb3()
-    cs                  character set handler
-    s                   First 0-terminated string to compare
-    t                   Second 0-terminated string to compare
-
-  IMPLEMENTATION
-
-  RETURN
-    - negative number if s < t
-    - positive number if s > t
-    - 0 is the strings are equal
-*/
-int
-my_wc_mb_filename(const charset_info_st * const,
-                  my_wc_t wc, unsigned char *s, unsigned char *e);
-
-int
-my_mb_wc_filename(const charset_info_st * const,
-                  my_wc_t *pwc, const unsigned char *s, const unsigned char *e);
-
-
-unsigned int my_ismbchar_utf8mb4(const charset_info_st * const cs,                                  const char *b, const char *e);
-unsigned int my_mbcharlen_utf8mb4(const charset_info_st * const, uint32_t c);
-
-size_t my_strnxfrmlen_utf8mb4(const charset_info_st * const, size_t len);
-size_t
-my_strnxfrm_utf8mb4(const charset_info_st * const cs,
-                    unsigned char *dst, size_t dstlen, uint32_t nweights,
-                    const unsigned char *src, size_t srclen, uint32_t flags);
-
-int
-my_wildcmp_utf8mb4(const charset_info_st * const cs,
-                   const char *str, const char *strend,
-                   const char *wildstr, const char *wildend,
-                   int escape, int w_one, int w_many);
-int
-my_strnncollsp_utf8mb4(const charset_info_st * const cs,
-                       const unsigned char *s, size_t slen,
-                       const unsigned char *t, size_t tlen,
-                       bool diff_if_only_endspace_difference);
-int my_strcasecmp_utf8mb4(const charset_info_st * const cs,
-                          const char *s, const char *t);
-
-int
-my_strnncoll_utf8mb4(const charset_info_st * const cs,
-                     const unsigned char *s, size_t slen,
-                     const unsigned char *t, size_t tlen,
-                     bool t_is_prefix);
-
-int
-my_mb_wc_utf8mb4(const charset_info_st * const cs,
-                 my_wc_t * pwc, const unsigned char *s, const unsigned char *e);
-
-int
-my_wc_mb_utf8mb4(const charset_info_st * const cs,
-                 my_wc_t wc, unsigned char *r, unsigned char *e);
-
-size_t my_caseup_str_utf8mb4(const charset_info_st * const cs, char *src);
-size_t my_casedn_str_utf8mb4(const charset_info_st * const cs, char *src);
-
-size_t
-my_caseup_utf8mb4(const charset_info_st * const cs, char *src, size_t srclen,
-                  char *dst, size_t dstlen);
-size_t
-my_casedn_utf8mb4(const charset_info_st * const cs,
-                  char *src, size_t srclen,
-                  char *dst, size_t dstlen);
-
-
-bool my_coll_init_uca(charset_info_st *cs, cs_alloc_func alloc);
-
-int my_strnncoll_any_uca(const charset_info_st * const cs,
-                         const unsigned char *s, size_t slen,
-                         const unsigned char *t, size_t tlen,
-                         bool t_is_prefix);
-
-int my_strnncollsp_any_uca(const charset_info_st * const cs,
-                           const unsigned char *s, size_t slen,
-                           const unsigned char *t, size_t tlen,
-                           bool diff_if_only_endspace_difference);
-
-void my_hash_sort_any_uca(const charset_info_st * const cs,
-                          const unsigned char *s, size_t slen,
-                          uint32_t *n1, uint32_t *n2);
-
-size_t my_strnxfrm_any_uca(const charset_info_st * const cs,
-                           unsigned char *dst, size_t dstlen, uint32_t nweights,
-                           const unsigned char *src, size_t srclen,
-                           uint32_t flags);
-
-int my_wildcmp_uca(const charset_info_st * const cs,
-                   const char *str,const char *str_end,
-                   const char *wildstr,const char *wildend,
-                   int escape, int w_one, int w_many);
-
-int my_strnncoll_8bit_bin(const charset_info_st * const,
-                          const unsigned char *s, size_t slen,
-                          const unsigned char *t, size_t tlen,
-                          bool t_is_prefix);
-int my_strnncollsp_8bit_bin(const charset_info_st * const,
-                            const unsigned char *a, size_t a_length,
-                            const unsigned char *b, size_t b_length,
-                            bool diff_if_only_endspace_difference);
-size_t my_case_str_bin(const charset_info_st * const, char *);
-size_t my_case_bin(const charset_info_st * const, char *,
-                   size_t srclen, char *, size_t);
-int my_strcasecmp_bin(const charset_info_st * const,
-                      const char *s, const char *t);
-size_t
-my_strnxfrm_8bit_bin(const charset_info_st * const cs,
-                     unsigned char * dst, size_t dstlen, uint32_t nweights,
-                     const unsigned char *src, size_t srclen, uint32_t flags);
-uint32_t my_instr_bin(const charset_info_st * const,
-                      const char *b, size_t b_length,
-                      const char *s, size_t s_length,
-                      my_match_t *match, uint32_t nmatch);
-size_t my_lengthsp_binary(const charset_info_st * const,
-                          const char *, size_t length);
-int my_mb_wc_bin(const charset_info_st * const,
-                 my_wc_t *wc, const unsigned char *str,
-                 const unsigned char *end);
-int my_wc_mb_bin(const charset_info_st * const, my_wc_t wc,
-                 unsigned char *str, unsigned char *end);
-void my_hash_sort_8bit_bin(const charset_info_st * const,
-                           const unsigned char *key, size_t len,
-                           uint32_t *nr1, uint32_t *nr2);
-int my_strnncoll_binary(const charset_info_st * const,
-                        const unsigned char *s, size_t slen,
-                        const unsigned char *t, size_t tlen,
-                        bool t_is_prefix);
-int my_strnncollsp_binary(const charset_info_st * const cs,
-                          const unsigned char *s, size_t slen,
-                          const unsigned char *t, size_t tlen,
-                          bool);
-
-
-#define	_MY_U	01	/* Upper case */
-#define	_MY_L	02	/* Lower case */
-#define	_MY_NMR	04	/* Numeral (digit) */
-#define	_MY_SPC	010	/* Spacing character */
-#define	_MY_PNT	020	/* Punctuation */
-#define	_MY_CTR	040	/* Control character */
-#define	_MY_B	0100	/* Blank */
-#define	_MY_X	0200	/* heXadecimal digit */
-
-
-inline static bool my_isascii(char c)      
-{
-  return (!(c & ~0177));
-}
-
-inline static char my_toascii(char c)
-{
-  return (c & 0177);
-}
-
-inline static char my_tocntrl(char c) 
-{
-  return (c & 31);
-}
-
-inline static char my_toprint(char c)
-{
-  return (c | 64);
-}
-
-inline static char my_toupper(const charset_info_st *s, unsigned char c)
-{
-  return s->to_upper[c];
-}
-
-inline static char my_tolower(const charset_info_st *s, unsigned char c)
-{
-  return s->to_lower[c];
-}
-
-inline static bool my_isalpha(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & (_MY_U | _MY_L);
-}
-
-inline static bool my_isupper(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & _MY_U;
-}
-
-inline static bool my_islower(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & _MY_L;
-}
-
-inline static bool my_isdigit(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & _MY_NMR;
-}
-
-inline static bool my_isxdigit(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & _MY_X;
-}
-
-inline static bool my_isalnum(const charset_info_st *s, unsigned char c) 
-{
-  return (s->ctype+1)[c] & (_MY_U | _MY_L | _MY_NMR);
-}
-
-inline static bool my_isspace(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & _MY_SPC;
-}
-
-inline static bool my_ispunct(const charset_info_st *s, unsigned char c)  
-{
-  return (s->ctype+1)[c] & _MY_PNT;
-}
-
-inline static bool my_isprint(const charset_info_st *s, unsigned char c)  
-{
-  return (s->ctype+1)[c] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR | _MY_B);
-}
-
-inline static bool my_isgraph(const charset_info_st *s, unsigned char c)
-{
-  return (s->ctype+1)[c] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR);
-}
-
-inline static bool my_iscntrl(const charset_info_st *s, unsigned char c)  
-{
-  return (s->ctype+1)[c] & _MY_CTR;
-}
-
-/* Some macros that should be cleaned up a little */
-inline static bool my_isvar(const charset_info_st *s, char c)
-{
-  return my_isalnum(s,c) || (c) == '_';
-}
-
-inline static bool my_isvar_start(const charset_info_st *s, char c)
-{
-  return my_isalpha(s,c) || (c) == '_';
-}
-
-inline static bool my_binary_compare(const charset_info_st *s)
-{
-  return s->state  & MY_CS_BINSORT;
-}
-
-inline static bool use_strnxfrm(const charset_info_st *s)
-{
-  return s->state & MY_CS_STRNXFRM;
-}
-
-inline static size_t my_strnxfrm(const charset_info_st *cs, 
-                                 unsigned char *dst, 
-                                 const size_t dstlen, 
-                                 const unsigned char *src, 
-                                 const uint32_t srclen)
-{
-  return (cs->coll->strnxfrm(cs, dst, dstlen, dstlen, src, srclen, MY_STRXFRM_PAD_WITH_SPACE));
-}
-
-inline static int my_strnncoll(const charset_info_st *cs, 
-                               const unsigned char *s, 
-                               const size_t slen, 
-                               const unsigned char *t,
-                               const size_t tlen) 
-{
-  return (cs->coll->strnncoll(cs, s, slen, t, tlen, 0));
-}
-
-inline static bool my_like_range(const charset_info_st *cs,
-                                 const char *ptr, const size_t ptrlen,
-                                 const char escape, 
-                                 const char w_one,
-                                 const char w_many, 
-                                 const size_t reslen, 
-                                 char *minstr, char *maxstr, 
-                                 size_t *minlen, size_t *maxlen)
-{
-  return (cs->coll->like_range(cs, ptr, ptrlen, escape, w_one, w_many, reslen, 
-                               minstr, maxstr, minlen, maxlen));
-}
-
-inline static int my_wildcmp(const charset_info_st *cs,
-                             const char *str, const char *strend,
-                             const char *w_str, const char *w_strend,
-                             const int escape,
-                             const int w_one, const int w_many) 
-{
-  return (cs->coll->wildcmp(cs, str, strend, w_str, w_strend, escape, w_one, w_many));
-}
-
-inline static int my_strcasecmp(const charset_info_st *cs, const char *s, const char *t)
-{
-  return (cs->coll->strcasecmp(cs, s, t));
-}
-
-template <typename CHAR_T>
-inline static size_t my_charpos(const charset_info_st *cs, 
-                                const CHAR_T *b, const CHAR_T* e, size_t num)
-{
-  return cs->cset->charpos(cs, reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(e), num);
-}
-
-inline static bool use_mb(const charset_info_st *cs)
-{
-  return cs->cset->ismbchar != NULL;
-}
-
-inline static unsigned int  my_ismbchar(const charset_info_st *cs, const char *a, const char *b)
-{
-  return cs->cset->ismbchar(cs, a, b);
-}
-
-inline static unsigned int my_mbcharlen(const charset_info_st *cs, uint32_t c)
-{
-  return cs->cset->mbcharlen(cs, c);
-}
-
-
-inline static size_t my_caseup_str(const charset_info_st *cs, char *src)
-{
-  return cs->cset->caseup_str(cs, src);
-}
-
-inline static size_t my_casedn_str(const charset_info_st *cs, char *src)
-{
-  return cs->cset->casedn_str(cs, src);
-}
-
-inline static long my_strntol(const charset_info_st *cs, 
-                              const char* s, const size_t l, const int base, char **e, int *err)
-{
-  return (cs->cset->strntol(cs, s, l, base, e, err));
-}
-
-inline static unsigned long my_strntoul(const charset_info_st *cs, 
-                                        const char* s, const size_t l, const int base, 
-                                        char **e, int *err)
-{
-  return (cs->cset->strntoul(cs, s, l, base, e, err));
-}
-
-inline static int64_t my_strntoll(const charset_info_st *cs, 
-                                 const char* s, const size_t l, const int base, char **e, int *err)
-{
-  return (cs->cset->strntoll(cs, s, l, base, e, err));
-}
-
-inline static int64_t my_strntoull(const charset_info_st *cs, 
-                                   const char* s, const size_t l, const int base, 
-                                   char **e, int *err)
-{
-  return (cs->cset->strntoull(cs, s, l, base, e, err));
-}
-
-
-inline static double my_strntod(const charset_info_st *cs, 
-                                char* s, const size_t l, char **e, int *err)
-{
-  return (cs->cset->strntod(cs, s, l, e, err));
-}
-
-int make_escape_code(const charset_info_st * const cs, const char *escape);
-
-} /* namespace drizzled */
-

=== modified file 'drizzled/ctype-bin.cc'
--- drizzled/ctype-bin.cc	2011-04-16 12:24:04 +0000
+++ drizzled/ctype-bin.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 #include <config.h>
 #include <drizzled/definitions.h>
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <algorithm>
 

=== modified file 'drizzled/ctype-mb.cc'
--- drizzled/ctype-mb.cc	2011-03-28 02:46:21 +0000
+++ drizzled/ctype-mb.cc	2011-04-20 22:33:33 +0000
@@ -16,7 +16,7 @@
 #include <config.h>
 
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <algorithm>
 

=== modified file 'drizzled/ctype-simple.cc'
--- drizzled/ctype-simple.cc	2011-03-28 02:46:21 +0000
+++ drizzled/ctype-simple.cc	2011-04-20 22:33:33 +0000
@@ -16,7 +16,7 @@
 #include <config.h>
 
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>

=== modified file 'drizzled/ctype-uca.cc'
--- drizzled/ctype-uca.cc	2011-03-28 02:46:21 +0000
+++ drizzled/ctype-uca.cc	2011-04-20 22:33:33 +0000
@@ -33,7 +33,7 @@
 
 
 #include <config.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/internal/m_string.h>
 #include <stdio.h>
 

=== modified file 'drizzled/ctype-uni.cc'
--- drizzled/ctype-uni.cc	2011-02-17 00:14:13 +0000
+++ drizzled/ctype-uni.cc	2011-04-20 22:33:33 +0000
@@ -15,7 +15,7 @@
 
 #include <config.h>
 #include <cstddef>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/ctype-utf8.cc'
--- drizzled/ctype-utf8.cc	2011-03-28 02:46:21 +0000
+++ drizzled/ctype-utf8.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <errno.h>
 
 #include <algorithm>

=== modified file 'drizzled/ctype.cc'
--- drizzled/ctype.cc	2011-03-28 02:46:21 +0000
+++ drizzled/ctype.cc	2011-04-20 22:33:33 +0000
@@ -15,7 +15,7 @@
 
 #include <config.h>
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/dtcollation.cc'
--- drizzled/dtcollation.cc	2011-03-28 02:46:21 +0000
+++ drizzled/dtcollation.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,6 @@
 
 #include <drizzled/definitions.h>
 #include <drizzled/internal/my_sys.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/error.h>
 #include <drizzled/function/str/conv_charset.h>
 #include <drizzled/session.h>

=== modified file 'drizzled/field.h'
--- drizzled/field.h	2011-03-29 12:04:36 +0000
+++ drizzled/field.h	2011-04-20 22:33:33 +0000
@@ -32,9 +32,9 @@
 #include <drizzled/key_map.h>
 #include <drizzled/sql_list.h>
 #include <drizzled/structs.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item_result.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <string>
 #include <vector>

=== modified file 'drizzled/field/blob.h'
--- drizzled/field/blob.h	2011-03-28 02:46:21 +0000
+++ drizzled/field/blob.h	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 
 #include <drizzled/field/str.h>
 
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 
 #include <string>
 

=== modified file 'drizzled/function/cast/boolean.h'
--- drizzled/function/cast/boolean.h	2011-03-14 05:40:28 +0000
+++ drizzled/function/cast/boolean.h	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/str/strfunc.h>
 
 namespace drizzled {

=== modified file 'drizzled/function/cast/signed.cc'
--- drizzled/function/cast/signed.cc	2011-03-03 08:29:06 +0000
+++ drizzled/function/cast/signed.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/error.h>
 #include <drizzled/function/cast/signed.h>
 #include <drizzled/lex_string.h>

=== modified file 'drizzled/function/cast/unsigned.cc'
--- drizzled/function/cast/unsigned.cc	2011-03-03 08:29:06 +0000
+++ drizzled/function/cast/unsigned.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/error.h>
 #include <drizzled/function/cast/unsigned.h>
 #include <drizzled/lex_string.h>

=== modified file 'drizzled/function/find_in_set.cc'
--- drizzled/function/find_in_set.cc	2011-03-28 02:46:21 +0000
+++ drizzled/function/find_in_set.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/find_in_set.h>
 
 /* Search after a string in a string of strings separated by ',' */

=== modified file 'drizzled/function/func.h'
--- drizzled/function/func.h	2011-03-14 05:40:28 +0000
+++ drizzled/function/func.h	2011-04-20 22:33:33 +0000
@@ -23,7 +23,7 @@
 
 /// TODO: Rename this file - func.h is stupid.
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item.h>
 #include <drizzled/item/bin_string.h>
 #include <drizzled/lex_string.h>

=== modified file 'drizzled/function/locate.cc'
--- drizzled/function/locate.cc	2011-03-03 08:29:06 +0000
+++ drizzled/function/locate.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/locate.h>
 #include <drizzled/lex_string.h>
 

=== modified file 'drizzled/function/math/int.cc'
--- drizzled/function/math/int.cc	2011-02-17 00:14:13 +0000
+++ drizzled/function/math/int.cc	2011-04-20 22:33:33 +0000
@@ -23,7 +23,7 @@
 
 #include <drizzled/sql_string.h>
 #include <drizzled/function/math/int.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/function/time/typecast.h'
--- drizzled/function/time/typecast.h	2011-03-28 02:46:21 +0000
+++ drizzled/function/time/typecast.h	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/field.h>
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/temporal.h>

=== removed file 'drizzled/global_charset_info.h'
--- drizzled/global_charset_info.h	2011-03-28 21:40:10 +0000
+++ drizzled/global_charset_info.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2009 Sun Microsystems, Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
-#pragma once
-
-#include <drizzled/visibility.h>
-
-namespace drizzled {
-
-/*
-  External variables
-*/
-extern DRIZZLED_API const charset_info_st *default_charset_info;
-extern DRIZZLED_API const charset_info_st *system_charset_info;
-extern const charset_info_st *files_charset_info;
-extern const charset_info_st *table_alias_charset;
-
-} /* namespace drizzled */
-

=== modified file 'drizzled/identifier/catalog.cc'
--- drizzled/identifier/catalog.cc	2011-03-28 14:13:55 +0000
+++ drizzled/identifier/catalog.cc	2011-04-20 22:33:33 +0000
@@ -28,7 +28,7 @@
 
 #include <drizzled/util/tablename_to_filename.h>
 #include <drizzled/util/backtrace.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <algorithm>
 #include <sstream>

=== modified file 'drizzled/identifier/schema.cc'
--- drizzled/identifier/schema.cc	2011-03-29 09:53:56 +0000
+++ drizzled/identifier/schema.cc	2011-04-20 22:33:33 +0000
@@ -28,7 +28,7 @@
 #include <drizzled/catalog/local.h>
 #include <drizzled/util/tablename_to_filename.h>
 #include <drizzled/util/backtrace.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <algorithm>
 #include <sstream>

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2011-04-11 16:57:51 +0000
+++ drizzled/include.am	2011-04-20 22:33:33 +0000
@@ -58,7 +58,6 @@
 			      drizzled/catalog/instance.h \
 			      drizzled/catalog/local.h \
 			      drizzled/charset.h \
-			      drizzled/charset_info.h \
 			      drizzled/check_stack_overrun.h \
 			      drizzled/common.h \
 			      drizzled/common_fwd.h \
@@ -217,7 +216,6 @@
 			      drizzled/generator/table.h \
 			      drizzled/gettext.h \
 			      drizzled/global_buffer.h \
-			      drizzled/global_charset_info.h \
 			      drizzled/ha_data.h \
 			      drizzled/ha_statistics.h \
 			      drizzled/handler_structs.h \

=== modified file 'drizzled/internal/my_access.cc'
--- drizzled/internal/my_access.cc	2011-03-18 06:14:52 +0000
+++ drizzled/internal/my_access.cc	2011-04-20 22:33:33 +0000
@@ -15,7 +15,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/internal/m_string.h>
 

=== modified file 'drizzled/internal/my_init.cc'
--- drizzled/internal/my_init.cc	2011-04-18 16:12:36 +0000
+++ drizzled/internal/my_init.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,6 @@
 #include "my_static.h"
 #include <drizzled/error.h>
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/charset.h>
 #include <cstdio>
 #include <cstdlib>

=== modified file 'drizzled/internal/my_sys.h'
--- drizzled/internal/my_sys.h	2011-03-28 14:13:55 +0000
+++ drizzled/internal/my_sys.h	2011-04-20 22:33:33 +0000
@@ -34,7 +34,7 @@
 #include <drizzled/definitions.h>
 #include <drizzled/internal/my_pthread.h>
 
-#include <drizzled/charset_info.h>                    /* for charset_info_st */
+#include <drizzled/charset.h>                    /* for charset_info_st */
 #include <stdarg.h>
 
 #ifndef errno				/* did we already get it? */

=== modified file 'drizzled/item.h'
--- drizzled/item.h	2011-03-28 21:40:10 +0000
+++ drizzled/item.h	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <drizzled/dtcollation.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item_result.h>
 #include <drizzled/memory/sql_alloc.h>
 #include <drizzled/sql_list.h>

=== modified file 'drizzled/item/bin_string.h'
--- drizzled/item/bin_string.h	2011-03-14 05:40:28 +0000
+++ drizzled/item/bin_string.h	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item/hex_string.h>
 
 #include <drizzled/visibility.h>

=== modified file 'drizzled/item/copy_string.h'
--- drizzled/item/copy_string.h	2011-03-14 05:40:28 +0000
+++ drizzled/item/copy_string.h	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item/field.h>
 #include <drizzled/item/ident.h>
 

=== modified file 'drizzled/item/decimal.cc'
--- drizzled/item/decimal.cc	2011-03-28 02:46:21 +0000
+++ drizzled/item/decimal.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/field.h>
 #include <drizzled/item/decimal.h>
 

=== modified file 'drizzled/item/int.cc'
--- drizzled/item/int.cc	2011-03-03 08:29:06 +0000
+++ drizzled/item/int.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/field.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/item/int.h>

=== modified file 'drizzled/item/null.h'
--- drizzled/item/null.h	2011-03-28 02:46:21 +0000
+++ drizzled/item/null.h	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item/basic_constant.h>
 
 namespace drizzled

=== modified file 'drizzled/item/string.h'
--- drizzled/item/string.h	2011-03-28 02:46:21 +0000
+++ drizzled/item/string.h	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <drizzled/item/basic_constant.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/item/sum.h'
--- drizzled/item/sum.h	2011-03-29 10:48:07 +0000
+++ drizzled/item/sum.h	2011-04-20 22:33:33 +0000
@@ -26,7 +26,7 @@
 #include <drizzled/item.h>
 #include <drizzled/item/field.h>
 #include <drizzled/item/bin_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/item/uint.cc'
--- drizzled/item/uint.cc	2011-03-03 08:29:06 +0000
+++ drizzled/item/uint.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/item/uint.h>
 
 namespace drizzled

=== modified file 'drizzled/message/schema.cc'
--- drizzled/message/schema.cc	2011-03-23 23:44:48 +0000
+++ drizzled/message/schema.cc	2011-04-20 22:33:33 +0000
@@ -26,7 +26,7 @@
 #include <drizzled/show.h>
 #include <drizzled/message/schema.h>
 #include <drizzled/session.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 #include <drizzled/catalog/local.h>
 

=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2011-04-04 21:37:55 +0000
+++ drizzled/message/statement_transform.cc	2011-04-20 22:33:33 +0000
@@ -34,8 +34,6 @@
 #include <boost/lexical_cast.hpp>
 
 #include <drizzled/charset.h>
-#include <drizzled/charset_info.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/message.h>
 #include <drizzled/message/statement_transform.h>
 #include <drizzled/message/transaction.pb.h>

=== modified file 'drizzled/message/table.cc'
--- drizzled/message/table.cc	2011-03-23 23:52:54 +0000
+++ drizzled/message/table.cc	2011-04-20 22:33:33 +0000
@@ -21,8 +21,7 @@
 
 #include <config.h>
 #include <drizzled/message/table.h>
-#include <drizzled/charset_info.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/catalog/local.h>
 
 namespace drizzled {

=== modified file 'drizzled/my_hash.cc'
--- drizzled/my_hash.cc	2011-04-16 12:24:04 +0000
+++ drizzled/my_hash.cc	2011-04-20 22:33:33 +0000
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <drizzled/my_hash.h>
 #include <drizzled/charset.h>
-#include <drizzled/charset_info.h>
 #include <vector>
 
 namespace drizzled {

=== modified file 'drizzled/option.cc'
--- drizzled/option.cc	2011-04-13 22:53:17 +0000
+++ drizzled/option.cc	2011-04-20 22:33:33 +0000
@@ -15,7 +15,7 @@
 
 #include <config.h>
 #include <drizzled/definitions.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/gettext.h>
 

=== modified file 'drizzled/parser.h'
--- drizzled/parser.h	2011-04-04 21:37:55 +0000
+++ drizzled/parser.h	2011-04-20 22:33:33 +0000
@@ -47,7 +47,6 @@
 #include <drizzled/function/time/timestamp_diff.h>
 #include <drizzled/function/time/typecast.h>
 #include <drizzled/function/time/year.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/item/boolean.h>
 #include <drizzled/item/cmpfunc.h>

=== modified file 'drizzled/plugin/schema_engine.cc'
--- drizzled/plugin/schema_engine.cc	2011-04-13 10:38:28 +0000
+++ drizzled/plugin/schema_engine.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,6 @@
 
 #include <drizzled/session.h>
 #include <drizzled/sql_base.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/charset.h>
 #include <drizzled/transaction_services.h>
 #include <drizzled/open_tables_state.h>

=== modified file 'drizzled/plugin/storage_engine.cc'
--- drizzled/plugin/storage_engine.cc	2011-04-09 16:11:46 +0000
+++ drizzled/plugin/storage_engine.cc	2011-04-20 22:33:33 +0000
@@ -45,7 +45,6 @@
 #include <drizzled/errmsg_print.h>
 #include <drizzled/xid.h>
 #include <drizzled/sql_table.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/charset.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/table_proto.h>

=== modified file 'drizzled/plugin/table_function.cc'
--- drizzled/plugin/table_function.cc	2011-04-08 12:15:12 +0000
+++ drizzled/plugin/table_function.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 
 #include <drizzled/current_session.h>
 #include <drizzled/gettext.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/plugin/table_function.h>
 #include <drizzled/session.h>
 #include <drizzled/show.h>

=== modified file 'drizzled/schema.cc'
--- drizzled/schema.cc	2011-03-23 14:35:15 +0000
+++ drizzled/schema.cc	2011-04-20 22:33:33 +0000
@@ -38,7 +38,6 @@
 #include <drizzled/sql_table.h>
 #include <drizzled/plugin/storage_engine.h>
 #include <drizzled/plugin/authorization.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/pthread_globals.h>
 #include <drizzled/charset.h>
 #include <drizzled/internal/my_sys.h>

=== modified file 'drizzled/session.h'
--- drizzled/session.h	2011-04-15 01:14:05 +0000
+++ drizzled/session.h	2011-04-20 22:33:33 +0000
@@ -33,7 +33,7 @@
 #include <sys/resource.h>
 #include <sys/time.h>
 
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/base.h>
 #include <drizzled/error.h>
 #include <drizzled/lock.h>

=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2011-04-14 19:00:59 +0000
+++ drizzled/sql_base.cc	2011-04-20 22:33:33 +0000
@@ -48,7 +48,7 @@
 #include <drizzled/field/epoch.h>
 #include <drizzled/field/null.h>
 #include <drizzled/sql_table.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/pthread_globals.h>
 #include <drizzled/internal/iocache.h>
 #include <drizzled/drizzled.h>

=== modified file 'drizzled/sql_locale.cc'
--- drizzled/sql_locale.cc	2011-03-26 17:26:44 +0000
+++ drizzled/sql_locale.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <drizzled/sql_locale.h>
 #include <drizzled/typelib.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/definitions.h>
 
 namespace drizzled {

=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2011-04-13 21:42:45 +0000
+++ drizzled/sql_parse.cc	2011-04-20 22:33:33 +0000
@@ -40,7 +40,7 @@
 #include <drizzled/statement.h>
 #include <drizzled/statement/alter_table.h>
 #include <drizzled/probes.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/plugin/logging.h>
 #include <drizzled/plugin/query_rewrite.h>
 #include <drizzled/plugin/query_cache.h>

=== modified file 'drizzled/sql_string.cc'
--- drizzled/sql_string.cc	2011-04-15 12:46:31 +0000
+++ drizzled/sql_string.cc	2011-04-20 22:33:33 +0000
@@ -21,9 +21,7 @@
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/memory/root.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/charset.h>
-#include <drizzled/global_charset_info.h>
 
 #include <algorithm>
 

=== modified file 'drizzled/sql_table.cc'
--- drizzled/sql_table.cc	2011-04-13 13:04:50 +0000
+++ drizzled/sql_table.cc	2011-04-20 22:33:33 +0000
@@ -35,7 +35,6 @@
 #include <drizzled/plugin/client.h>
 #include <drizzled/identifier.h>
 #include <drizzled/internal/m_string.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/charset.h>
 #include <drizzled/definition/cache.h>
 #include <drizzled/system_variables.h>

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2011-04-13 10:38:28 +0000
+++ drizzled/statement/alter_table.cc	2011-04-20 22:33:33 +0000
@@ -28,7 +28,7 @@
 #include <drizzled/lock.h>
 #include <drizzled/session.h>
 #include <drizzled/statement/alter_table.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/gettext.h>
 #include <drizzled/data_home.h>
 #include <drizzled/sql_table.h>

=== modified file 'drizzled/strfunc.cc'
--- drizzled/strfunc.cc	2011-04-13 14:47:23 +0000
+++ drizzled/strfunc.cc	2011-04-20 22:33:33 +0000
@@ -17,8 +17,7 @@
 #include <config.h>
 
 #include <drizzled/typelib.h>
-#include <drizzled/charset_info.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/sys_var.h'
--- drizzled/sys_var.h	2011-03-28 23:48:44 +0000
+++ drizzled/sys_var.h	2011-04-20 22:33:33 +0000
@@ -28,7 +28,7 @@
 #include <drizzled/show_type.h>
 #include <drizzled/item_result.h>
 #include <drizzled/base.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/lex_string.h>
 #include <drizzled/visibility.h>
 

=== modified file 'drizzled/table_proto.cc'
--- drizzled/table_proto.cc	2011-03-28 02:46:21 +0000
+++ drizzled/table_proto.cc	2011-04-20 22:33:33 +0000
@@ -18,7 +18,6 @@
 #include <drizzled/session.h>
 #include <drizzled/unireg.h>
 #include <drizzled/sql_table.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/message/statement_transform.h>
 
 #include <drizzled/plugin/storage_engine.h>

=== modified file 'drizzled/temporal.cc'
--- drizzled/temporal.cc	2011-03-10 15:44:28 +0000
+++ drizzled/temporal.cc	2011-04-20 22:33:33 +0000
@@ -36,7 +36,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/type/decimal.h>
 #include <drizzled/calendar.h>
 #include <drizzled/temporal.h>

=== modified file 'drizzled/time_functions.cc'
--- drizzled/time_functions.cc	2011-03-28 02:46:21 +0000
+++ drizzled/time_functions.cc	2011-04-20 22:33:33 +0000
@@ -26,7 +26,7 @@
 #include <drizzled/tztime.h>
 #include <drizzled/session.h>
 #include <drizzled/time_functions.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/system_variables.h>
 
 namespace drizzled {

=== modified file 'drizzled/type/boolean.cc'
--- drizzled/type/boolean.cc	2011-02-17 00:14:13 +0000
+++ drizzled/type/boolean.cc	2011-04-20 22:33:33 +0000
@@ -22,8 +22,7 @@
 
 #include <drizzled/sql_string.h>
 #include <drizzled/type/boolean.h>
-#include <drizzled/global_charset_info.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled
 {

=== modified file 'drizzled/type/decimal.cc'
--- drizzled/type/decimal.cc	2011-04-14 21:56:22 +0000
+++ drizzled/type/decimal.cc	2011-04-20 22:33:33 +0000
@@ -107,7 +107,7 @@
 
 #include <drizzled/definitions.h>
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/type/decimal.h>
 
 #include <plugin/myisam/myisampack.h>

=== modified file 'drizzled/type/time.cc'
--- drizzled/type/time.cc	2011-02-17 00:14:13 +0000
+++ drizzled/type/time.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 #include <drizzled/util/gmtime.h>
 
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/util/test.h>
 #include <drizzled/definitions.h>
 #include <drizzled/sql_string.h>

=== modified file 'drizzled/typelib.cc'
--- drizzled/typelib.cc	2011-04-15 14:23:21 +0000
+++ drizzled/typelib.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/memory/root.h>
 #include <drizzled/typelib.h>
 

=== modified file 'drizzled/tztime.cc'
--- drizzled/tztime.cc	2011-04-16 13:00:30 +0000
+++ drizzled/tztime.cc	2011-04-20 22:33:33 +0000
@@ -24,7 +24,7 @@
 #include <drizzled/gettext.h>
 #include <drizzled/session.h>
 #include <drizzled/time_functions.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/user_var_entry.cc'
--- drizzled/user_var_entry.cc	2011-03-28 02:46:21 +0000
+++ drizzled/user_var_entry.cc	2011-04-20 22:33:33 +0000
@@ -23,7 +23,7 @@
 #include <drizzled/internal/m_string.h>
 #include <drizzled/user_var_entry.h>
 #include <drizzled/type/decimal.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 namespace drizzled {
 

=== modified file 'drizzled/xid.cc'
--- drizzled/xid.cc	2011-04-13 16:14:00 +0000
+++ drizzled/xid.cc	2011-04-20 22:33:33 +0000
@@ -22,8 +22,6 @@
 
 #include <drizzled/xid.h>
 #include <drizzled/charset.h>
-#include <drizzled/global_charset_info.h>
-#include <drizzled/charset_info.h>
 
 namespace drizzled {
 

=== modified file 'plugin/haildb/datadict_table_message.cc'
--- plugin/haildb/datadict_table_message.cc	2011-02-17 00:14:13 +0000
+++ plugin/haildb/datadict_table_message.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 
 #include "haildb_engine.h"
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/message/table.pb.h>
 
 using namespace drizzled;

=== modified file 'plugin/haildb/haildb_engine.cc'
--- plugin/haildb/haildb_engine.cc	2011-03-29 18:35:14 +0000
+++ plugin/haildb/haildb_engine.cc	2011-04-20 22:33:33 +0000
@@ -91,7 +91,6 @@
 #include <drizzled/message/table.pb.h>
 #include <drizzled/internal/m_string.h>
 
-#include <drizzled/global_charset_info.h>
 
 #include "haildb_datadict_dump_func.h"
 #include "config_table_function.h"

=== modified file 'plugin/hex_functions/hex_functions.cc'
--- plugin/hex_functions/hex_functions.cc	2011-04-14 21:56:22 +0000
+++ plugin/hex_functions/hex_functions.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/plugin/function.h>

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2011-04-15 14:40:55 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2011-04-20 22:33:33 +0000
@@ -45,7 +45,6 @@
 
 #include <drizzled/error.h>
 #include <drizzled/errmsg_print.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/plugin.h>

=== modified file 'plugin/innobase/handler/handler0alter.cc'
--- plugin/innobase/handler/handler0alter.cc	2011-02-17 00:14:13 +0000
+++ plugin/innobase/handler/handler0alter.cc	2011-04-20 22:33:33 +0000
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <drizzled/error.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/field.h>
 #include <drizzled/table.h>
 #include <drizzled/field/varstring.h>

=== modified file 'plugin/innobase/include/create_replication.h'
--- plugin/innobase/include/create_replication.h	2011-03-14 05:40:28 +0000
+++ plugin/innobase/include/create_replication.h	2011-04-20 22:33:33 +0000
@@ -34,7 +34,7 @@
 
 #include <drizzled/message/table.pb.h>
 #include <drizzled/table.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 struct read_replication_state_st {
   mtr_t mtr;

=== modified file 'plugin/innobase/xtrabackup/xtrabackup.cc'
--- plugin/innobase/xtrabackup/xtrabackup.cc	2011-04-02 07:33:46 +0000
+++ plugin/innobase/xtrabackup/xtrabackup.cc	2011-04-20 22:33:33 +0000
@@ -29,9 +29,7 @@
 #include <config.h>
 #include <string>
 #include <drizzled/internal/my_sys.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/charset.h>
-#include <drizzled/global_charset_info.h> // for default_charset_info
 #include <drizzled/gettext.h>
 #include <drizzled/constrained_value.h>
 #include <drizzled/configmake.h>

=== modified file 'plugin/math_functions/ord.cc'
--- plugin/math_functions/ord.cc	2011-02-17 00:14:13 +0000
+++ plugin/math_functions/ord.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 
 #include "ord.h"
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/type/decimal.h>
 
 namespace drizzled

=== modified file 'plugin/md5/md5.cc'
--- plugin/md5/md5.cc	2011-04-15 11:25:25 +0000
+++ plugin/md5/md5.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,6 @@
 #include <gcrypt.h>
 
 #include <drizzled/charset.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/item/func.h>
 #include <drizzled/plugin/function.h>

=== modified file 'plugin/memory/hp_hash.cc'
--- plugin/memory/hp_hash.cc	2011-03-28 14:13:55 +0000
+++ plugin/memory/hp_hash.cc	2011-04-20 22:33:33 +0000
@@ -17,7 +17,7 @@
 
 #include "heap_priv.h"
 #include <drizzled/error_t.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/util/test.h>
 
 #include <math.h>

=== modified file 'plugin/myisam/mi_create.cc'
--- plugin/myisam/mi_create.cc	2011-02-17 00:14:13 +0000
+++ plugin/myisam/mi_create.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 #include <drizzled/internal/my_sys.h>
 
 #include <drizzled/util/test.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/error.h>
 
 #include <cassert>

=== modified file 'plugin/myisam/mi_key.cc'
--- plugin/myisam/mi_key.cc	2011-03-28 02:46:21 +0000
+++ plugin/myisam/mi_key.cc	2011-04-20 22:33:33 +0000
@@ -16,7 +16,7 @@
 /* Functions to handle keys */
 
 #include "myisam_priv.h"
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif

=== modified file 'plugin/myisam/mi_locking.cc'
--- plugin/myisam/mi_locking.cc	2011-03-29 09:33:49 +0000
+++ plugin/myisam/mi_locking.cc	2011-04-20 22:33:33 +0000
@@ -21,7 +21,7 @@
 */
 
 #include "myisam_priv.h"
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/util/test.h>
 
 using namespace std;

=== modified file 'plugin/myisam/mi_open.cc'
--- plugin/myisam/mi_open.cc	2011-03-29 20:45:43 +0000
+++ plugin/myisam/mi_open.cc	2011-04-20 22:33:33 +0000
@@ -23,10 +23,8 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/scoped_array.hpp>
 
-#include <drizzled/charset_info.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/util/test.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/charset.h>
 #include <drizzled/memory/multi_malloc.h>
 #include <drizzled/identifier.h>

=== modified file 'plugin/myisam/mi_search.cc'
--- plugin/myisam/mi_search.cc	2011-02-17 00:14:13 +0000
+++ plugin/myisam/mi_search.cc	2011-04-20 22:33:33 +0000
@@ -16,7 +16,7 @@
 /* key handling functions */
 
 #include "myisam_priv.h"
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/util/test.h>
 

=== modified file 'plugin/myisam/mi_unique.cc'
--- plugin/myisam/mi_unique.cc	2011-03-28 06:10:45 +0000
+++ plugin/myisam/mi_unique.cc	2011-04-20 22:33:33 +0000
@@ -16,7 +16,7 @@
 /* Functions to check if a row is unique */
 
 #include "myisam_priv.h"
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 using namespace drizzled;
 

=== modified file 'plugin/myisam/my_handler.cc'
--- plugin/myisam/my_handler.cc	2011-03-28 02:46:21 +0000
+++ plugin/myisam/my_handler.cc	2011-04-20 22:33:33 +0000
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/base.h>
 #include <plugin/myisam/my_handler.h>
 #include <drizzled/internal/my_sys.h>

=== modified file 'plugin/myisam/my_handler.h'
--- plugin/myisam/my_handler.h	2011-03-28 02:46:21 +0000
+++ plugin/myisam/my_handler.h	2011-04-20 22:33:33 +0000
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <plugin/myisam/myisampack.h>
 
 /*

=== modified file 'plugin/pbms/src/backup_ms.cc'
--- plugin/pbms/src/backup_ms.cc	2011-02-21 16:33:37 +0000
+++ plugin/pbms/src/backup_ms.cc	2011-04-20 22:33:33 +0000
@@ -38,7 +38,7 @@
 #include <drizzled/session.h>
 #include <drizzled/table.h>
 #include <drizzled/message/table.pb.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/table_proto.h>
 #include <drizzled/field.h>
 #include <drizzled/field/varstring.h>

=== modified file 'plugin/pbms/src/cloud_ms.cc'
--- plugin/pbms/src/cloud_ms.cc	2011-02-17 00:14:13 +0000
+++ plugin/pbms/src/cloud_ms.cc	2011-04-20 22:33:33 +0000
@@ -26,7 +26,7 @@
 #include <drizzled/session.h>
 #include <drizzled/table.h>
 #include <drizzled/message/table.pb.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/table_proto.h>
 #include <drizzled/session.h>
 #include <drizzled/field.h>

=== modified file 'plugin/pbms/src/database_ms.cc'
--- plugin/pbms/src/database_ms.cc	2011-02-21 16:33:37 +0000
+++ plugin/pbms/src/database_ms.cc	2011-04-20 22:33:33 +0000
@@ -33,7 +33,7 @@
 #include <drizzled/session.h>
 #include <drizzled/table.h>
 #include <drizzled/message/table.pb.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/table_proto.h>
 #include <drizzled/field.h>
 #endif

=== modified file 'plugin/pbms/src/metadata_ms.h'
--- plugin/pbms/src/metadata_ms.h	2011-03-14 05:40:28 +0000
+++ plugin/pbms/src/metadata_ms.h	2011-04-20 22:33:33 +0000
@@ -31,7 +31,7 @@
 
 #ifdef DRIZZLED
 #include <drizzled/internal/m_string.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #else
 #include "m_ctype.h"
 #endif

=== modified file 'plugin/pbms/src/system_table_ms.cc'
--- plugin/pbms/src/system_table_ms.cc	2011-02-21 16:33:37 +0000
+++ plugin/pbms/src/system_table_ms.cc	2011-04-20 22:33:33 +0000
@@ -36,7 +36,7 @@
 #include <drizzled/field/blob.h>
 
 #include <drizzled/message/table.pb.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/table_proto.h>
 #endif
 

=== modified file 'plugin/reverse_function/reverse_function.cc'
--- plugin/reverse_function/reverse_function.cc	2011-02-17 00:14:13 +0000
+++ plugin/reverse_function/reverse_function.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 
 #include <drizzled/plugin/function.h>
 #include <drizzled/function/str/strfunc.h>
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 
 using namespace drizzled;
 

=== modified file 'plugin/schema_engine/schema.cc'
--- plugin/schema_engine/schema.cc	2011-03-29 09:53:56 +0000
+++ plugin/schema_engine/schema.cc	2011-04-20 22:33:33 +0000
@@ -24,9 +24,7 @@
 #include <plugin/schema_engine/schema.h>
 #include <drizzled/schema.h>
 #include <drizzled/sql_table.h>
-#include <drizzled/global_charset_info.h>
 #include <drizzled/charset.h>
-#include <drizzled/charset_info.h>
 #include <drizzled/cursor.h>
 #include <drizzled/data_home.h>
 

=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2011-03-28 17:36:12 +0000
+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2011-04-20 22:33:33 +0000
@@ -27,7 +27,7 @@
 #include <drizzled/message/table.pb.h>
 #include <drizzled/internal/m_string.h>
 
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 
 #include <boost/unordered_map.hpp>
 

=== modified file 'plugin/string_functions/format.cc'
--- plugin/string_functions/format.cc	2011-03-03 08:29:06 +0000
+++ plugin/string_functions/format.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 
 #include <limits>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/type/decimal.h>
 #include <drizzled/table.h>
 

=== modified file 'plugin/substr_functions/substr_functions.cc'
--- plugin/substr_functions/substr_functions.cc	2011-02-17 00:14:13 +0000
+++ plugin/substr_functions/substr_functions.cc	2011-04-20 22:33:33 +0000
@@ -22,7 +22,7 @@
 
 #include <algorithm>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/plugin/function.h>
 

=== modified file 'plugin/tableprototester/tableprototester.cc'
--- plugin/tableprototester/tableprototester.cc	2011-03-28 17:36:12 +0000
+++ plugin/tableprototester/tableprototester.cc	2011-04-20 22:33:33 +0000
@@ -27,7 +27,7 @@
 #include <fstream>
 
 #include <drizzled/error.h>
-#include <drizzled/global_charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/internal/m_string.h>
 #include <drizzled/internal/my_pthread.h>
 #include <drizzled/message/table.h>

=== modified file 'plugin/utility_functions/catalog.h'
--- plugin/utility_functions/catalog.h	2011-03-14 05:40:28 +0000
+++ plugin/utility_functions/catalog.h	2011-04-20 22:33:33 +0000
@@ -20,9 +20,8 @@
 
 #pragma once
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/str/strfunc.h>
-#include <drizzled/global_charset_info.h>
 
 namespace drizzled
 {

=== modified file 'plugin/uuid_function/uuid_function.cc'
--- plugin/uuid_function/uuid_function.cc	2011-02-17 00:14:13 +0000
+++ plugin/uuid_function/uuid_function.cc	2011-04-20 22:33:33 +0000
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <drizzled/charset_info.h>
+#include <drizzled/charset.h>
 #include <drizzled/function/str/strfunc.h>
 #include <drizzled/item/func.h>
 #include <drizzled/plugin/function.h>