summaryrefslogtreecommitdiff
path: root/mysys/charset.c
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-01-08 15:43:03 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-01-08 15:43:03 +0400
commit1c334ec0c588da5f93dff2e75f7c64c22c204c60 (patch)
treea3ea8754d7f5679efc1ce014841b4c924d0f8df4 /mysys/charset.c
parentfe47e5358c61b9cf78aa0ed515a74f9537834114 (diff)
downloadmariadb-git-1c334ec0c588da5f93dff2e75f7c64c22c204c60.tar.gz
charset.c:
find only primary collations mysys/charset.c: find only primary collations
Diffstat (limited to 'mysys/charset.c')
-rw-r--r--mysys/charset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index dbeb2969f0e..8d852fd99c2 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -682,7 +682,8 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, myf flags)
for (css= all_charsets; css < all_charsets+255; ++css)
{
- if ( css[0] && css[0]->csname && !strcmp(css[0]->csname, cs_name))
+ if ( css[0] && (css[0]->state & MY_CS_PRIMARY) &&
+ css[0]->csname && !strcmp(css[0]->csname, cs_name))
{
cs= css[0]->number ? get_internal_charset(css[0]->number,flags) : NULL;
break;