summaryrefslogtreecommitdiff
path: root/include/my_compare.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-02-05 20:09:24 +0100
committerSergei Golubchik <serg@mariadb.org>2018-02-06 14:51:44 +0100
commit775a8a0e4b7c30ef7393108cdfae08b1f8dd64e8 (patch)
tree80b9035a5d334d51eb393467af2c2d31c25f368c /include/my_compare.h
parentc98c616e7f729e4c59fbd48a6a2068e858a57fcf (diff)
downloadmariadb-git-775a8a0e4b7c30ef7393108cdfae08b1f8dd64e8.tar.gz
compilation error on windows
get_rec_bits() must return uchar, it's result is often assigned to uchar. And len is always less than 8.
Diffstat (limited to 'include/my_compare.h')
-rw-r--r--include/my_compare.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_compare.h b/include/my_compare.h
index b650430bb9e..f4e9ecbf80b 100644
--- a/include/my_compare.h
+++ b/include/my_compare.h
@@ -91,7 +91,7 @@ typedef struct st_HA_KEYSEG /* Key-portion */
#define size_to_store_key_length(length) ((length) < 255 ? 1 : 3)
-static inline uint16 get_rec_bits(const uchar *ptr, uchar ofs, uint len)
+static inline uchar get_rec_bits(const uchar *ptr, uchar ofs, uint len)
{
uint16 val= ptr[0];
if (ofs + len > 8)