diff options
| author | unknown <msvensson@msdesk.(none)> | 2005-10-06 14:40:18 +0200 |
|---|---|---|
| committer | unknown <msvensson@msdesk.(none)> | 2005-10-06 14:40:18 +0200 |
| commit | df76450716d0550d8313f5d4afecd0e105558b5a (patch) | |
| tree | 734fdb74393f521e44d3e254c283586558f54ca4 /sql/item_cmpfunc.cc | |
| parent | 3c2dca475dfa91c95f2488831fafacacaf852347 (diff) | |
| parent | e6ec5794f64617dda0cfdeb4bae422cff6d81950 (diff) | |
| download | mariadb-git-df76450716d0550d8313f5d4afecd0e105558b5a.tar.gz | |
Merge msdesk.(none):/home/msvensson/mysql-4.1
into msdesk.(none):/home/msvensson/mysql-5.0
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
Auto merged
innobase/os/os0sync.c:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
client/mysql.cc:
Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
Merge
mysql-test/r/ctype_ujis.result:
Merge
strings/ctype-mb.c:
Merge
strings/ctype-tis620.c:
Merge
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 85ba8ff794d..138ebaaf9a5 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2958,9 +2958,9 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) String *escape_str= escape_item->val_str(&tmp_value1); if (escape_str) { - CHARSET_INFO *cs= cmp.cmp_collation.collation; - if (use_mb(cs)) + if (use_mb(cmp.cmp_collation.collation)) { + CHARSET_INFO *cs= escape_str->charset(); my_wc_t wc; int rc= cs->cset->mb_wc(cs, &wc, (const uchar*) escape_str->ptr(), @@ -2975,6 +2975,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) code instead of Unicode code as "escape" argument. Convert to "cs" if charset of escape differs. */ + CHARSET_INFO *cs= cmp.cmp_collation.collation; uint32 unused; if (escape_str->needs_conversion(escape_str->length(), escape_str->charset(), cs, &unused)) |