diff options
| author | igor@rurik.mysql.com <> | 2006-06-22 00:08:32 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-06-22 00:08:32 -0700 |
| commit | f1eb33096f528913a3d721988c3645f84606fd74 (patch) | |
| tree | 42e680c41b3150bea82fc0ef02f1cddfcac8c9a7 /strings | |
| parent | 85f0e50ab3f712ff7a923dbe570e98880840458b (diff) | |
| download | mariadb-git-f1eb33096f528913a3d721988c3645f84606fd74.tar.gz | |
Post-merge fix.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-mb.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index 9d7aad0ca05..36b52826486 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -536,12 +536,7 @@ my_bool my_like_range_mb(CHARSET_INFO *cs, if (*ptr == escape && ptr+1 != end) ptr++; /* Skip escape */ 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: 'a\0\0... is the smallest possible string when we have space expand |