Commit 2fd0acd3 authored by Marko Mäkelä's avatar Marko Mäkelä

Fix the 64-bit Windows build

parent a02cac47
...@@ -9621,7 +9621,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, ...@@ -9621,7 +9621,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
elements= acl_users.elements; elements= acl_users.elements;
break; break;
case DB_ACL: case DB_ACL:
elements= acl_dbs.elements(); elements= int(acl_dbs.elements());
break; break;
case COLUMN_PRIVILEGES_HASH: case COLUMN_PRIVILEGES_HASH:
grant_name_hash= &column_priv_hash; grant_name_hash= &column_priv_hash;
...@@ -11274,7 +11274,7 @@ static int show_database_grants(THD *thd, SHOW_VAR *var, char *buff, ...@@ -11274,7 +11274,7 @@ static int show_database_grants(THD *thd, SHOW_VAR *var, char *buff,
{ {
var->type= SHOW_UINT; var->type= SHOW_UINT;
var->value= buff; var->value= buff;
*(uint *)buff= acl_dbs.elements(); *(uint *)buff= uint(acl_dbs.elements());
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment