cleanup: reduce code duplication

storage/maria/ma_search.c

@@ -600,8 +600,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
             break;
       }
 
-      if ((reverse ? -my_flag : my_flag) > 0)      /* mismatch */
-        break;
       if (my_flag==0) /* match */
       {
 	/*
@@ -629,8 +627,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
 	      goto cmp_rest;		/* should never happen */
 	    my_flag= (uchar)' ' - *k;
 	  }
-          if ((reverse ? -my_flag : my_flag) > 0)
-            break;
         }
         else if (len > cmplen)
         {
@@ -643,10 +639,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
 	       vseg < vseg_end && *vseg == (uchar) ' ';
 	       vseg++, matched++) ;
 	  DBUG_ASSERT(vseg < vseg_end);
-
           my_flag= *vseg - (uchar)' ';
-          if ((reverse ? -my_flag : my_flag) > 0)
-            break;
         }
         else
 	{
@@ -674,6 +667,8 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
 	  }
 	}
       }
+      if ((reverse ? -my_flag : my_flag) > 0)      /* mismatch */
+        break;
       matched-=left;
     }
     /* else (matched < prefix_len) ---> do nothing. */

storage/myisam/mi_search.c

@@ -453,8 +453,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
             break;
       }
 
-      if ((reverse ? -my_flag : my_flag) > 0)      /* mismatch */
-        break;
       if (my_flag==0) /* match */
       {
 	/*
@@ -481,8 +479,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
 	      goto cmp_rest;		/* should never happen */
 	    my_flag= (uchar)' ' - *k;
 	  }
-          if ((reverse ? -my_flag : my_flag) > 0)
-            break;
         }
         else if (len > cmplen)
         {
@@ -497,8 +493,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
 	  DBUG_ASSERT(vseg < vseg_end);
 
           my_flag= *vseg - (uchar)' ';
-          if ((reverse ? -my_flag : my_flag) > 0)
-	    break;
         }
         else
 	{
@@ -525,6 +519,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
 	  }
 	}
       }
+      if ((reverse ? -my_flag : my_flag) > 0)      /* mismatch */
+        break;
       matched-=left;
     }
     /* else (matched < prefix_len) ---> do nothing. */