diff options
| author | igor@rurik.mysql.com <> | 2003-06-18 07:31:23 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-06-18 07:31:23 -0700 |
| commit | 54255915030e01b2fb68869e63bd238efc5303e4 (patch) | |
| tree | 27ab3e463780703cee768e7eca750774895f6cb6 /mysys | |
| parent | f6b1262070f6bac16ef9ea75472aca79ea8e3d22 (diff) | |
| parent | 242ee84fb9e64a7c1257d6c5467eb5815c84229f (diff) | |
| download | mariadb-git-54255915030e01b2fb68869e63bd238efc5303e4.tar.gz | |
Merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 12 | ||||
| -rw-r--r-- | mysys/errors.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index ad0468a5087..7dab1a38325 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -368,6 +368,7 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) char *get_charsets_dir(char *buf) { const char *sharedir= SHAREDIR; + char *res; DBUG_ENTER("get_charsets_dir"); if (charsets_dir != NULL) @@ -381,9 +382,9 @@ char *get_charsets_dir(char *buf) strxmov(buf, DEFAULT_CHARSET_HOME, "/", sharedir, "/", CHARSET_DIR, NullS); } - convert_dirname(buf,buf,NullS); + res= convert_dirname(buf,buf,NullS); DBUG_PRINT("info",("charsets dir: '%s'", buf)); - DBUG_RETURN(strend(buf)); + DBUG_RETURN(res); } CHARSET_INFO *all_charsets[256]; @@ -613,6 +614,9 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, { CHARSET_INFO *cs=NULL; CHARSET_INFO **css; + DBUG_ENTER("get_charset_by_csname"); + DBUG_PRINT("enter",("name: '%s'", cs_name)); + (void) init_available_charsets(MYF(0)); /* If it isn't initialized */ for (css= all_charsets; css < all_charsets+255; ++css) @@ -624,7 +628,7 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, cs= css[0]->number ? get_internal_charset(css[0]->number,flags) : NULL; break; } - } + } if (!cs && (flags & MY_WME)) { @@ -633,5 +637,5 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, my_error(EE_UNKNOWN_CHARSET, MYF(ME_BELL), cs_name, index_file); } - return cs; + DBUG_RETURN(cs); } diff --git a/mysys/errors.c b/mysys/errors.c index 8a120e0e869..a2226fc12c5 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -82,7 +82,7 @@ void init_glob_errs() EE(EE_OPEN_WARNING) = "%d files and %d streams is left open\n"; EE(EE_DISK_FULL) = "Disk is full writing '%s'. Waiting for someone to free space..."; EE(EE_CANT_MKDIR) ="Can't create directory '%s' (Errcode: %d)"; - EE(EE_UNKNOWN_CHARSET)= "Character set is not a compiled character set and is not specified in the %s file"; + EE(EE_UNKNOWN_CHARSET)= "Character set '%s' is not a compiled character set and is not specified in the %s file"; EE(EE_OUT_OF_FILERESOURCES)="Out of resources when opening file '%s' (Errcode: %d)"; EE(EE_CANT_READLINK)="Can't read value for symlink '%s' (Error %d)"; EE(EE_CANT_SYMLINK)="Can't create symlink '%s' pointing at '%s' (Error %d)"; |