diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-23 14:24:52 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-23 14:24:52 +0500 |
| commit | d7ab5da88fd11c69af7144cd56af283a31502ff6 (patch) | |
| tree | 8330e147efd63b462e7bd0786d85172646f1e0c2 /mysys/charset.c | |
| parent | 3a1501d60e45552f7cbf2522b1cceb2d0f0f7c92 (diff) | |
| download | mariadb-git-d7ab5da88fd11c69af7144cd56af283a31502ff6.tar.gz | |
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
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 9b8903bc6b7..af4d3620df2 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -314,7 +314,7 @@ static int add_collation(CHARSET_INFO *cs) if (!all_charsets[cs->number]) { if (cs->state & MY_CS_COMPILED) - return MY_XML_OK; + goto clear; if (!(all_charsets[cs->number]= (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0)))) return MY_XML_ERROR; @@ -343,6 +343,7 @@ static int add_collation(CHARSET_INFO *cs) if (cs->comment) dst->comment= my_once_strdup(cs->comment,MYF(MY_WME)); } +clear: cs->number= 0; cs->primary_number= 0; cs->binary_number= 0; |