summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2013-06-06 17:38:07 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2013-06-06 17:38:07 +0200
commit1ff1cb10fc236010b5969058cab934c2b306c931 (patch)
tree343f515eb8e4cec80bd6808fb288c12f8ce807c6
parent5cf5a9a1e8660cbcc60362d90cc22b63b2c05ed7 (diff)
downloadmariadb-git-1ff1cb10fc236010b5969058cab934c2b306c931.tar.gz
fix compile error
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 4fe99b24508..69290a64a29 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -968,7 +968,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
{
/* Starting from 5.0.3 we have max_user_connections field */
ptr= get_field(thd->mem_root, table->field[next_field++]);
- user.user_resource.user_conn= ptr ? atoll(ptr) : 0;
+ user.user_resource.user_conn= ptr ? atoi(ptr) : 0;
}
if (table->s->fields >= 41)