diff options
| author | unknown <rburnett@build.mysql.com> | 2004-08-24 17:24:05 +0200 |
|---|---|---|
| committer | unknown <rburnett@build.mysql.com> | 2004-08-24 17:24:05 +0200 |
| commit | b040c680778b58126b40c51847295336c7a76729 (patch) | |
| tree | 1fdba074332e90254ff77edb80d7cdb3287626b6 | |
| parent | 0e316cedc3092cfa69e0f526428fca013ba96a0b (diff) | |
| download | mariadb-git-b040c680778b58126b40c51847295336c7a76729.tar.gz | |
my_handler.c:
Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
mysys/my_handler.c:
Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
| -rw-r--r-- | mysys/my_handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index 6003808df25..360a7666e94 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -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; |