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 | 209b24473cd04a16d1cc548f5e7d0a5f1ebfefe2 (patch) | |
tree | 95062708b51b3445411d11fd00f9ed76c9c8db40 /mysys/errors.c | |
parent | 2fb807d1d0a817c177e02cee7b508b6122ce832e (diff) | |
download | mariadb-git-209b24473cd04a16d1cc548f5e7d0a5f1ebfefe2.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/errors.c')
-rw-r--r-- | mysys/errors.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |