diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 23:58:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-08 00:06:07 +0200 |
| commit | 2fd0acd30ffd5f9091b272ca1ff2a883ca36718b (patch) | |
| tree | d2324b618a96cabc3916dc517d847ccfddb8d226 | |
| parent | a02cac47f6a4ffce03e1e24ec7a00aa949819cce (diff) | |
| download | mariadb-git-2fd0acd30ffd5f9091b272ca1ff2a883ca36718b.tar.gz | |
Fix the 64-bit Windows build
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 837f6650f17..59ba324df31 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -9621,7 +9621,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, elements= acl_users.elements; break; case DB_ACL: - elements= acl_dbs.elements(); + elements= int(acl_dbs.elements()); break; case COLUMN_PRIVILEGES_HASH: grant_name_hash= &column_priv_hash; @@ -11274,7 +11274,7 @@ static int show_database_grants(THD *thd, SHOW_VAR *var, char *buff, { var->type= SHOW_UINT; var->value= buff; - *(uint *)buff= acl_dbs.elements(); + *(uint *)buff= uint(acl_dbs.elements()); return 0; } |