diff options
| author | bar@bar.mysql.r18.ru <> | 2003-03-26 13:27:19 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-03-26 13:27:19 +0400 |
| commit | 4e06f1f5bde6287bc40680fc3e3773a7dd884936 (patch) | |
| tree | f6c81b8c3ec946a2f232aa6e96ac3aa215b0137f /mysys | |
| parent | 5e3155f1c73ec127bbb155ea17d9408a283ef0ff (diff) | |
| download | mariadb-git-4e06f1f5bde6287bc40680fc3e3773a7dd884936.tar.gz | |
German Phone book collation is always compiled
Some collation names have been renamed
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 30bd186c531..e1545dc4f8f 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -553,7 +553,10 @@ uint get_charset_number(const char *charset_name) for (cs= all_charsets; cs < all_charsets+255; ++cs) { - if ( cs[0] && cs[0]->name && !strcasecmp(cs[0]->name, charset_name)) + if ( cs[0] && cs[0]->name && + (!strcasecmp(cs[0]->name, charset_name) || + (!strcasecmp(cs[0]->csname, charset_name) && + (cs[0]->state & MY_CS_PRIMARY)))) return cs[0]->number; } return 0; /* this mimics find_type() */ |