mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Post-merge fix.
This commit is contained in:
parent
85f0e50ab3
commit
f1eb33096f
1 changed files with 1 additions and 6 deletions
|
@ -536,12 +536,7 @@ my_bool my_like_range_mb(CHARSET_INFO *cs,
|
||||||
if (*ptr == escape && ptr+1 != end)
|
if (*ptr == escape && ptr+1 != end)
|
||||||
ptr++; /* Skip escape */
|
ptr++; /* Skip escape */
|
||||||
else if (*ptr == w_one || *ptr == w_many) /* '_' and '%' in SQL */
|
else if (*ptr == w_one || *ptr == w_many) /* '_' and '%' in SQL */
|
||||||
{
|
{
|
||||||
charlen= my_charpos(cs, min_org, min_str, res_length/cs->mbmaxlen);
|
|
||||||
|
|
||||||
if (charlen < (uint) (min_str - min_org))
|
|
||||||
min_str= min_org + charlen;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Calculate length of keys:
|
Calculate length of keys:
|
||||||
'a\0\0... is the smallest possible string when we have space expand
|
'a\0\0... is the smallest possible string when we have space expand
|
||||||
|
|
Loading…
Add table
Reference in a new issue