diff options
| author | unknown <svoj@june.mysql.com> | 2007-10-24 16:39:13 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-10-24 16:39:13 +0500 |
| commit | 22b367054440a030b6b6eda6eed69459e533fc6f (patch) | |
| tree | a2f17b0cbc82c0391480a5670453e73dbbb531c8 /include | |
| parent | fb9a562b1cc2b9048eff094bb7004fb3db0e7fd0 (diff) | |
| parent | 4fda18a3ec5de47fc96d5ea2e8521fc7c8adb87f (diff) | |
| download | mariadb-git-22b367054440a030b6b6eda6eed69459e533fc6f.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
include/my_sys.h:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysys/charset.c:
Manual merge.
sql/item_func.cc:
Manual merge.
Diffstat (limited to 'include')
| -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 4f7e75a836e..7218f91cccd 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -879,6 +879,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); |