diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 17:44:12 +0500 |
| commit | 4637832fa19b2866929c1e5cb7c9dd0a40db15c9 (patch) | |
| tree | c1d41d9ae86450c3c93a4424253c8553ffcec322 /mysys | |
| parent | 01add721927cf92ec3368cb56d685777aacbfe42 (diff) | |
| download | mariadb-git-4637832fa19b2866929c1e5cb7c9dd0a40db15c9.tar.gz | |
Some SHOW VARIABLES have been renamed:
collation_client -> character_set_client
collation_results -> character_set_results
character_set -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 2d9500e4b0d..d685104abac 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -548,9 +548,7 @@ uint get_charset_number(const char *charset_name) for (cs= all_charsets; cs < all_charsets+255; ++cs) { if ( cs[0] && cs[0]->name && - (!my_strcasecmp(&my_charset_latin1, cs[0]->name, charset_name) || - (!my_strcasecmp(&my_charset_latin1, cs[0]->csname, charset_name) && - (cs[0]->state & MY_CS_PRIMARY)))) + !my_strcasecmp(&my_charset_latin1, cs[0]->name, charset_name)) return cs[0]->number; } return 0; /* this mimics find_type() */ |