diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-04 14:12:20 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-04 14:12:20 +0400 |
| commit | 782295137b513c45f83add72008b1bfbfde2502d (patch) | |
| tree | 43f10d041f0f37a8e361f86eb0f69bdf64ef0864 /include | |
| parent | a533a95c288e1a4b8ff24874f880ed1cc8d7dd9b (diff) | |
| download | mariadb-git-782295137b513c45f83add72008b1bfbfde2502d.tar.gz | |
Some changes to separate charset and collation terms
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 09a24201588..85397796e73 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -49,6 +49,7 @@ typedef struct unicase_info_st { #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_CHARSET_UNDEFINED 0 #define MY_CHARSET_CURRENT (default_charset_info->number) @@ -65,6 +66,7 @@ typedef struct charset_info_st { uint number; uint state; + const char *csname; const char *name; const char *comment; uchar *ctype; @@ -127,6 +129,7 @@ typedef struct charset_info_st int (*l10tostr)(struct charset_info_st *, char *to, uint n, int radix, long int val); int (*ll10tostr)(struct charset_info_st *, char *to, uint n, int radix, longlong val); + /* String-to-number convertion routines */ long (*strntol)(struct charset_info_st *, const char *s, uint l,char **e, int base); ulong (*strntoul)(struct charset_info_st *, const char *s, uint l, char **e, int base); longlong (*strntoll)(struct charset_info_st *, const char *s, uint l, char **e, int base); |