From 1c334ec0c588da5f93dff2e75f7c64c22c204c60 Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.mysql.r18.ru>
Date: Wed, 8 Jan 2003 15:43:03 +0400
Subject: [PATCH] charset.c:   find only primary collations

mysys/charset.c:
  find only primary collations
---
 mysys/charset.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;