diff options
| author | unknown <joerg@trift2.> | 2007-11-14 15:26:38 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-11-14 15:26:38 +0100 |
| commit | e3c7265135dcfef8a96b092f310ead1ad9b45b99 (patch) | |
| tree | c5d07cf26e05e0d323b3cd4d786ddebf85e785c5 /include/my_sys.h | |
| parent | fc71ff899ba5247655bb9a03867e44ee13460f3e (diff) | |
| parent | 001c78e29e7a917bad4d64673e84230768d936ad (diff) | |
| download | mariadb-git-e3c7265135dcfef8a96b092f310ead1ad9b45b99.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
include/my_sys.h:
Auto merged
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index d31ebb1f440..d1f8283947b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -881,6 +881,8 @@ extern CHARSET_INFO *get_charset(uint cs_number, myf flags); extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); +extern CHARSET_INFO *get_compatible_charset_with_ctype(CHARSET_INFO + *original_cs); extern void free_charsets(void); extern char *get_charsets_dir(char *buf); extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); |