summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-07-03 01:08:34 +0200
committerunknown <pem@mysql.com>2003-07-03 01:08:34 +0200
commitc0eb448582cce5b899ed58a0e1b03e8ee732a05c (patch)
tree0951b7ec937b540a0d48fa1cba8a0d38bdf26036 /sql/sql_acl.cc
parent0b37eae10748dc4399c8bf0abbb0eadc37333744 (diff)
downloadmariadb-git-c0eb448582cce5b899ed58a0e1b03e8ee732a05c.tar.gz
Added missing (char*) casts in bzero calls.
(Needed for platforms with the traditional bzero prototype.) Fixes BUG#460.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 90497cc8b43..225d84f4751 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -275,7 +275,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
else
{
user.ssl_type=SSL_TYPE_NONE;
- bzero(&(user.user_resource),sizeof(user.user_resource));
+ bzero((char *)&(user.user_resource),sizeof(user.user_resource));
#ifndef TO_BE_REMOVED
if (table->fields <= 13)
{ // Without grant
@@ -506,7 +506,7 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user,
*priv_user=(char*) user;
DBUG_ENTER("acl_getroot");
- bzero(mqh,sizeof(USER_RESOURCES));
+ bzero((char *)mqh,sizeof(USER_RESOURCES));
if (!initialized)
{
// If no data allow anything