Commit 68a1e80d authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into build.mysql.com:/users/rburnett/mysql41
parents 3e45c82e a66d1ba7

mysys/my_handler.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, 
            (flag=mi_compare_text(keyseg->charset,a,a_length,b,b_length,

				  (my_bool) ((nextflag & SEARCH_PREFIX) &&

					     next_key_length <= 0),

				  !(nextflag & SEARCH_PREFIX))))

				  (my_bool)!(nextflag & SEARCH_PREFIX))))

          return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);

        a+=a_length;

        b+=b_length;
@@ -171,7 +171,7 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, 
            (flag= mi_compare_text(keyseg->charset, a, a_length, b, b_length,

				   (my_bool) ((nextflag & SEARCH_PREFIX) &&

					      next_key_length <= 0),

				   !(nextflag & SEARCH_PREFIX))))

				   (my_bool)!(nextflag & SEARCH_PREFIX))))

          return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag);

        a=end;

        b+=length;