diff options
| author | hf@deer.(none) <> | 2003-09-17 20:58:31 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-09-17 20:58:31 +0500 |
| commit | ccc28f46de2eaff4f15e0958851815779fcf87a4 (patch) | |
| tree | d3298d275fc3f5ab012d27d5d4e80c44869ce472 /include | |
| parent | ddbca4176df154a27179e9b0b8a5379a41259a58 (diff) | |
| parent | 731b8392eee5635bf1628e96f3cd4fac1f75dc29 (diff) | |
| download | mariadb-git-ccc28f46de2eaff4f15e0958851815779fcf87a4.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 47a039baddd..6f04b766aec 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -209,8 +209,10 @@ extern CHARSET_INFO *default_charset_info; extern CHARSET_INFO *all_charsets[256]; extern CHARSET_INFO compiled_charsets[]; -extern uint get_charset_number(const char *cs_name); +extern uint get_charset_number(const char *cs_name, uint cs_flags); +extern uint get_collation_number(const char *name); extern const char *get_charset_name(uint cs_number); + 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, |