summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2004-08-18 12:07:54 +0500
committerunknown <bar@mysql.com>2004-08-18 12:07:54 +0500
commiteda663a155d6127d05bfd1beadc648136122b820 (patch)
treebd4ffe5d8f61ae489eb241d9de17f4b7500b31b4 /sql
parent74dc0adce57dc6c30c40dd80ffc3d97573f1d601 (diff)
downloadmariadb-git-eda663a155d6127d05bfd1beadc648136122b820.tar.gz
Many files:
LIKE crashed mysqld for binary collations in some cases strings/ctype-big5.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-euc_kr.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-gb2312.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-gbk.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-latin1.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-sjis.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-tis620.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-ucs2.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-ujis.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-utf8.c: LIKE crashed mysqld for binary collations in some cases sql/item_cmpfunc.cc: LIKE crashed mysqld for binary collations in some cases
Diffstat (limited to 'sql')
-rw-r--r--sql/item_cmpfunc.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index c440a0491c5..23bdad1aae5 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2459,7 +2459,7 @@ void Item_func_like::turboBM_compute_suffixes(int *suff)
*splm1 = pattern_len;
- if (cs == &my_charset_bin)
+ if (!cs->sort_order)
{
int i;
for (i = pattern_len - 2; i >= 0; i--)
@@ -2562,7 +2562,7 @@ void Item_func_like::turboBM_compute_bad_character_shifts()
for (i = bmBc; i < end; i++)
*i = pattern_len;
- if (cs == &my_charset_bin)
+ if (!cs->sort_order)
{
for (j = 0; j < plm1; j++)
bmBc[(uint) (uchar) pattern[j]] = plm1 - j;
@@ -2593,7 +2593,7 @@ bool Item_func_like::turboBM_matches(const char* text, int text_len) const
const int tlmpl= text_len - pattern_len;
/* Searching */
- if (cs == &my_charset_bin)
+ if (!cs->sort_order)
{
while (j <= tlmpl)
{