diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-09-17 16:22:58 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-09-17 16:22:58 +0500 |
| commit | 34fc9b2b568ee9cac49f208d6b046f60907ec544 (patch) | |
| tree | 298ca40ac1fef653ffff869aec7c52ecfd043b43 /include/my_sys.h | |
| parent | abd0afa368e259da0d63d13bfdc6c0ded1f3edd5 (diff) | |
| download | mariadb-git-34fc9b2b568ee9cac49f208d6b046f60907ec544.tar.gz | |
Charset number is now stored into error.sys by comp_err and loaded by mysqld.
Diffstat (limited to 'include/my_sys.h')
| -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, |