1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Win64 build

Browse Source
This commit is contained in:
Vladislav Vaintroub 2018-12-08 02:19:37 +01:00
parent b1c41e112c
commit fac997feef
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_acl.cc
View File

@ -2378,19 +2378,19 @@ static void rebuild_acl_dbs()
/* /*
Return index of the first entry with given user in the array, 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 Assumes the array is sorted by get_username
*/ */
template<typename T> uint find_first_user(T* arr, uint len, const char *user) template<typename T> size_t find_first_user(T* arr, size_t len, const char *user)
{ {
uint low= 0; size_t low= 0;
uint high= len; size_t high= len;
uint mid; size_t mid;
bool found= false; bool found= false;
if(!len) if(!len)
return UINT_MAX; return SIZE_T_MAX;
#ifndef DBUG_OFF #ifndef DBUG_OFF
for (uint i = 0; i < len - 1; i++) for (uint i = 0; i < len - 1; i++)
@ -2408,7 +2408,7 @@ template<typename T> uint find_first_user(T* arr, uint len, const char *user)
else else
low= mid + 1; 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) static size_t acl_find_user_by_name(const char *user)