diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-04 19:53:53 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-04 19:53:53 +0400 |
| commit | 92754ae2db37f30ae5eebbfcfbf04b699681f816 (patch) | |
| tree | 2b70663d2120be55bd50428b732af291f1ff73f2 /mysys/charset.c | |
| parent | 3cbb978d51ce694c941671f8bc4efd673d80e4e0 (diff) | |
| download | mariadb-git-92754ae2db37f30ae5eebbfcfbf04b699681f816.tar.gz | |
SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index c5d86f9c856..cfe1dcefcaf 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -572,7 +572,9 @@ CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags) } -CHARSET_INFO *get_charset_by_csname(const char *cs_name, myf flags) +CHARSET_INFO *get_charset_by_csname(const char *cs_name, + uint cs_flags, + myf flags) { CHARSET_INFO *cs=NULL; CHARSET_INFO **css; @@ -580,7 +582,7 @@ 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]->state & MY_CS_PRIMARY) && + if ( css[0] && (css[0]->state & cs_flags) && css[0]->csname && !strcmp(css[0]->csname, cs_name)) { cs= css[0]->number ? get_internal_charset(css[0]->number,flags) : NULL; |