summaryrefslogtreecommitdiff
path: root/mysys/charset.c
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-02-22 16:37:25 +0400
committerunknown <bar@mysql.com>2005-02-22 16:37:25 +0400
commit209b24473cd04a16d1cc548f5e7d0a5f1ebfefe2 (patch)
tree95062708b51b3445411d11fd00f9ed76c9c8db40 /mysys/charset.c
parent2fb807d1d0a817c177e02cee7b508b6122ce832e (diff)
downloadmariadb-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/charset.c')
-rw-r--r--mysys/charset.c2
1 files changed, 1 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;