diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-02 15:04:07 +0400 |
| commit | 0b6c4bb34f99b8f4023fd0bef25a1b714f96b699 (patch) | |
| tree | 87e5f83097f30c9fb7e30928800bcc92690f6bbd /include/my_sys.h | |
| parent | 9538bbfce9055f99529adb461d101b7b236eb5a3 (diff) | |
| download | mariadb-git-0b6c4bb34f99b8f4023fd0bef25a1b714f96b699.tar.gz | |
MDEV-4928 Merge collation customization improvements
Merging the following MySQL-5.6 changes:
- WL#5624: Collation customization improvements
http://dev.mysql.com/worklog/task/?id=5624
- WL#4013: Unicode german2 collation
http://dev.mysql.com/worklog/task/?id=4013
- Bug#62429 XML: ExtractValue, UpdateXML max arg length 127 chars
http://bugs.mysql.com/bug.php?id=62429
(required by WL#5624)
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 3065de17892..e3eb52d6018 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -271,12 +271,6 @@ extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern my_bool timed_mutexes; -enum loglevel { - ERROR_LEVEL, - WARNING_LEVEL, - INFORMATION_LEVEL -}; - enum cache_type { TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE, @@ -947,15 +941,20 @@ void my_uuid2str(const uchar *guid, char *s); void my_uuid_end(); /* character sets */ +extern void my_charset_loader_init_mysys(MY_CHARSET_LOADER *loader); 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 *my_collation_get_by_name(MY_CHARSET_LOADER *loader, + const char *name, myf flags); extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); - +extern CHARSET_INFO *my_charset_get_by_name(MY_CHARSET_LOADER *loader, + const char *name, + uint cs_flags, myf my_flags); extern my_bool resolve_charset(const char *cs_name, CHARSET_INFO *default_cs, CHARSET_INFO **cs); |