charset.c:

find only primary collations

charset.c:
find only primary collations
ea4621e5 · bar@bar.mysql.r18.ru · 9a99ac89 · ea4621e5
Commit ea4621e5 authored Jan 08, 2003 by bar@bar.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mysys/charset.c mysys/charset.c +2 -1

No files found.
--- 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;