From fac997feef048de877e39d1366871d5872c61710 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sat, 8 Dec 2018 02:19:37 +0100 Subject: [PATCH] Fix Win64 build --- sql/sql_acl.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index f1612a7927f..2b21e7c2d3f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2378,19 +2378,19 @@ static void rebuild_acl_dbs() /* Return index of the first entry with given user in the array, - or UINT_MAX if not found. + or SIZE_T_MAX if not found. Assumes the array is sorted by get_username */ -template uint find_first_user(T* arr, uint len, const char *user) +template size_t find_first_user(T* arr, size_t len, const char *user) { - uint low= 0; - uint high= len; - uint mid; + size_t low= 0; + size_t high= len; + size_t mid; bool found= false; if(!len) - return UINT_MAX; + return SIZE_T_MAX; #ifndef DBUG_OFF for (uint i = 0; i < len - 1; i++) @@ -2408,7 +2408,7 @@ template uint find_first_user(T* arr, uint len, const char *user) else low= mid + 1; } - return (!found || low == len || strcmp(arr[low].get_username(), user)!=0 )?UINT_MAX:low; + return (!found || low == len || strcmp(arr[low].get_username(), user)!=0 )?SIZE_T_MAX:low; } static size_t acl_find_user_by_name(const char *user)