mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 23:54:31 +02:00
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
This commit is contained in:
parent
74dc0adce5
commit
eda663a155
11 changed files with 13 additions and 13 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6347,7 +6347,7 @@ CHARSET_INFO my_charset_big5_bin=
|
|||
ctype_big5,
|
||||
to_lower_big5,
|
||||
to_upper_big5,
|
||||
sort_order_big5,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -8715,7 +8715,7 @@ CHARSET_INFO my_charset_euckr_bin=
|
|||
ctype_euc_kr,
|
||||
to_lower_euc_kr,
|
||||
to_upper_euc_kr,
|
||||
sort_order_euc_kr,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -5765,7 +5765,7 @@ CHARSET_INFO my_charset_gb2312_bin=
|
|||
ctype_gb2312,
|
||||
to_lower_gb2312,
|
||||
to_upper_gb2312,
|
||||
sort_order_gb2312,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -9996,7 +9996,7 @@ CHARSET_INFO my_charset_gbk_bin=
|
|||
ctype_gbk,
|
||||
to_lower_gbk,
|
||||
to_upper_gbk,
|
||||
sort_order_gbk,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -728,7 +728,7 @@ CHARSET_INFO my_charset_latin1_bin=
|
|||
ctype_latin1,
|
||||
to_lower_latin1,
|
||||
to_upper_latin1,
|
||||
sort_order_latin1_de,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
cs_to_uni, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -4615,7 +4615,7 @@ CHARSET_INFO my_charset_sjis_bin=
|
|||
ctype_sjis,
|
||||
to_lower_sjis,
|
||||
to_upper_sjis,
|
||||
sort_order_sjis,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -988,7 +988,7 @@ CHARSET_INFO my_charset_tis620_bin=
|
|||
ctype_tis620,
|
||||
to_lower_tis620,
|
||||
to_upper_tis620,
|
||||
sort_order_tis620,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -1480,7 +1480,7 @@ CHARSET_INFO my_charset_ucs2_bin=
|
|||
ctype_ucs2, /* ctype */
|
||||
to_lower_ucs2, /* to_lower */
|
||||
to_upper_ucs2, /* to_upper */
|
||||
to_upper_ucs2, /* sort_order */
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -8502,7 +8502,7 @@ CHARSET_INFO my_charset_ujis_bin=
|
|||
ctype_ujis,
|
||||
to_lower_ujis,
|
||||
to_upper_ujis,
|
||||
sort_order_ujis,
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
|
|
@ -2125,7 +2125,7 @@ CHARSET_INFO my_charset_utf8_bin=
|
|||
ctype_utf8, /* ctype */
|
||||
to_lower_utf8, /* to_lower */
|
||||
to_upper_utf8, /* to_upper */
|
||||
to_upper_utf8, /* sort_order */
|
||||
NULL, /* sort_order */
|
||||
NULL, /* contractions */
|
||||
NULL, /* sort_order_big*/
|
||||
NULL, /* tab_to_uni */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue