Commit d7ab5da8 authored by unknown's avatar unknown

charset.c:

  Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations


mysys/charset.c:
  Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations
parent 3a1501d6
...@@ -314,7 +314,7 @@ static int add_collation(CHARSET_INFO *cs) ...@@ -314,7 +314,7 @@ static int add_collation(CHARSET_INFO *cs)
if (!all_charsets[cs->number]) if (!all_charsets[cs->number])
{ {
if (cs->state & MY_CS_COMPILED) if (cs->state & MY_CS_COMPILED)
return MY_XML_OK; goto clear;
if (!(all_charsets[cs->number]= if (!(all_charsets[cs->number]=
(CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0)))) (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0))))
return MY_XML_ERROR; return MY_XML_ERROR;
...@@ -343,6 +343,7 @@ static int add_collation(CHARSET_INFO *cs) ...@@ -343,6 +343,7 @@ static int add_collation(CHARSET_INFO *cs)
if (cs->comment) if (cs->comment)
dst->comment= my_once_strdup(cs->comment,MYF(MY_WME)); dst->comment= my_once_strdup(cs->comment,MYF(MY_WME));
} }
clear:
cs->number= 0; cs->number= 0;
cs->primary_number= 0; cs->primary_number= 0;
cs->binary_number= 0; cs->binary_number= 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment