diff options
| author | unknown <bar@bar.udmsearch.izhnet.ru> | 2002-07-30 14:02:29 +0500 |
|---|---|---|
| committer | unknown <bar@bar.udmsearch.izhnet.ru> | 2002-07-30 14:02:29 +0500 |
| commit | fcaf867bb93d188397cb4788b6204283a8af39d3 (patch) | |
| tree | f0b07d900cb88e69708407c2b7b0fe29bd62dfdb /include | |
| parent | ebdc990b69455548fa412a22286b302f0c1a1322 (diff) | |
| download | mariadb-git-fcaf867bb93d188397cb4788b6204283a8af39d3.tar.gz | |
Renamed some charset related constant
New fields in CHARSET_INFO for more nice SHOW CHARACTER SET
Dynamic charsets are now handled in faster way
SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too
include/m_ctype.h:
Renamed constant
New fields in CHARSET_INFO
include/my_sys.h:
Constant have been moved to m_ctype.h
libmysqld/lib_sql.cc:
Renamed constant
mysys/charset.c:
Dynamic charsets are now handled in new way to speedup things
mysys/test_charset.c:
Renamed constant
sql/mysqld.cc:
Renamed constant
sql/sql_show.cc:
SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too
strings/ctype.c:
New fields in CHARSET_INFO
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 13 | ||||
| -rw-r--r-- | include/my_sys.h | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 3715402b4f4..70acfcb3dec 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -42,6 +42,14 @@ typedef struct unicase_info_st { #define MY_CS_TOOSMALL -1 #define MY_CS_TOOFEW(n) (-1-(n)) + /* My charsets_list flags */ +#define MY_NO_SETS 0 +#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 */ + + typedef struct my_uni_idx_st { uint16 from; uint16 to; @@ -52,14 +60,16 @@ typedef struct my_uni_idx_st { typedef struct charset_info_st { uint number; + uint state; const char *name; + const char *comment; uchar *ctype; uchar *to_lower; uchar *to_upper; uchar *sort_order; uint16 *tab_to_uni; MY_UNI_IDX *tab_from_uni; - + /* Collation routines */ uint strxfrm_multiply; int (*strnncoll)(struct charset_info_st *, @@ -107,6 +117,7 @@ extern CHARSET_INFO *system_charset_info; extern CHARSET_INFO *find_compiled_charset(uint cs_number); extern CHARSET_INFO *find_compiled_charset_by_name(const char *name); extern CHARSET_INFO compiled_charsets[]; +extern CHARSET_INFO all_charsets[256]; extern uint compiled_charset_number(const char *name); extern const char *compiled_charset_name(uint charset_number); diff --git a/include/my_sys.h b/include/my_sys.h index 54ed9110e95..ab7159a334b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -105,13 +105,6 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_SEEK_CUR 1 #define MY_SEEK_END 2 - /* My charsets_list flags */ -#define MY_NO_SETS 0 -#define MY_COMPILED_SETS 1 /* show compiled-in sets */ -#define MY_CONFIG_SETS 2 /* sets that have a *.conf file */ -#define MY_INDEX_SETS 4 /* all sets listed in the Index file */ -#define MY_LOADED_SETS 8 /* the sets that are currently loaded */ - /* Some constants */ #define MY_WAIT_FOR_USER_TO_FIX_PANIC 60 /* in seconds */ #define MY_WAIT_GIVE_USER_A_MESSAGE 10 /* Every 10 times of prev */ |