diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
| commit | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (patch) | |
| tree | bf340fae8765f9d5f1e1ac543d2926bef0021e03 /sql/item_cmpfunc.cc | |
| parent | 2901c3b8fa7d4095445c6ca2070367d2f61af2d1 (diff) | |
| parent | a7c82c5693110bfa744bd4cf481b02eaabb7a0aa (diff) | |
| download | mariadb-git-755e72a0f55b593cf930ae9bd69998f82b70d5cf.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b9e7b1d14ad..21de9a96f03 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2158,7 +2158,7 @@ bool Item_func_like::turboBM_matches(const char* text, int text_len) const int shift = pattern_len; int j = 0; int u = 0; - CHARSET_INFO *cs=system_charset_info; // QQ Needs to be fixed + CHARSET_INFO *cs= cmp.cmp_collation.collation; // QQ Needs to be fixed const int plm1= pattern_len - 1; const int tlmpl= text_len - pattern_len; |