From f1eb33096f528913a3d721988c3645f84606fd74 Mon Sep 17 00:00:00 2001
From: "igor@rurik.mysql.com" <>
Date: Thu, 22 Jun 2006 00:08:32 -0700
Subject: [PATCH] Post-merge fix.

---
 strings/ctype-mb.c | 7 +------
 1 file changed, 1 insertion(+), 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