diff options
| author | unknown <bar@mysql.com> | 2005-02-22 16:37:25 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-22 16:37:25 +0400 |
| commit | 158b210d01da6786d16f5190eda033df862f6b57 (patch) | |
| tree | 95062708b51b3445411d11fd00f9ed76c9c8db40 /mysys | |
| parent | aa91a06368f988837f6754f6ec817e7a331e8a31 (diff) | |
| download | mariadb-git-158b210d01da6786d16f5190eda033df862f6b57.tar.gz | |
Bug#8349 myisamchk: --set-charset does not work
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
include/mysys_err.h:
New mysys error message "unknown collation".
mysys/charset.c:
Display more proper error when a collation is not found.
mysys/errors.c:
New "unknown collation" error.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 2 | ||||
| -rw-r--r-- | mysys/errors.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 5840c885e40..4b7ad3e59f4 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -530,7 +530,7 @@ CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags) { 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); + my_error(EE_UNKNOWN_COLLATION, MYF(ME_BELL), cs_name, index_file); } return cs; diff --git a/mysys/errors.c b/mysys/errors.c index 5401c2b3cc6..05436c9a212 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -49,6 +49,7 @@ const char * NEAR globerrs[GLOBERRS]= "Can't create symlink '%s' pointing at '%s' (Error %d)", "Error on realpath() on '%s' (Error %d)", "Can't sync file '%s' to disk (Errcode: %d)", + "Collation '%s' is not a compiled collation and is not specified in the '%s' file", }; void init_glob_errs(void) @@ -89,5 +90,6 @@ void init_glob_errs() EE(EE_CANT_SYMLINK)= "Can't create symlink '%s' pointing at '%s' (Error %d)"; EE(EE_REALPATH)= "Error on realpath() on '%s' (Error %d)"; EE(EE_SYNC)= "Can't sync file '%s' to disk (Errcode: %d)"; + EE(EE_UNKNOWN_COLLATION)= "Collation '%s' is not a compiled collation and is not specified in the %s file"; } #endif |