database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

New function to search for charset using charset name rather than collation name

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2003-01-08 15:39:15 +04:00
parent ba8a9d4187
commit 9a99ac89e5
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_sys.h
View File

@@ -206,6 +206,7 @@ extern const char *get_charset_name(uint cs_number);
extern CHARSET_INFO *get_charset(uint cs_number, myf flags);
extern my_bool set_default_charset(uint cs, 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, myf flags);
extern my_bool set_default_charset_by_name(const char *cs_name, myf flags);
extern void free_charsets(void);
extern char *list_charsets(myf want_flags); /* my_free() this string... */

39
mysys/charset.c
View File

@@ -615,14 +615,6 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
}
static CHARSET_INFO *get_internal_charset_by_name(const char *name, myf flags)
{
uint cs_number=get_charset_number(name);
return cs_number ? get_internal_charset(cs_number,flags) : NULL;
}
CHARSET_INFO *get_charset(uint cs_number, myf flags)
{
CHARSET_INFO *cs;
@@ -664,10 +656,39 @@ my_bool set_default_charset(uint cs, myf flags)
CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags)
{
uint cs_number;
CHARSET_INFO *cs;
(void) init_available_charsets(MYF(0)); /* If it isn't initialized */
cs=get_internal_charset_by_name(cs_name, flags);
cs_number=get_charset_number(cs_name);
cs= cs_number ? get_internal_charset(cs_number,flags) : NULL;
if (!cs && (flags & MY_WME))
{
char index_file[FN_REFLEN];
strmov(get_charsets_dir(index_file),MY_CHARSET_INDEX);
my_error(EE_UNKNOWN_CHARSET, MYF(ME_BELL), cs_name, index_file);
}
return cs;
}
CHARSET_INFO *get_charset_by_csname(const char *cs_name, myf flags)
{
CHARSET_INFO *cs=NULL;
CHARSET_INFO **css;
(void) init_available_charsets(MYF(0)); /* If it isn't initialized */
for (css= all_charsets; css < all_charsets+255; ++css)
{
if ( css[0] && css[0]->csname && !strcmp(css[0]->csname, cs_name))
{
cs= css[0]->number ? get_internal_charset(css[0]->number,flags) : NULL;
break;
}
}
if (!cs && (flags & MY_WME))
{
char index_file[FN_REFLEN];