From 8683f513cdf6d9edd27cce8a32251b17e7ed13a4 Mon Sep 17 00:00:00 2001 From: "brian@brian-akers-computer.local" <> Date: Tue, 7 Jun 2005 18:23:58 -0700 Subject: [PATCH] Removed warnings for gcc 4.0 --- sql/log_event.cc | 2 +- sql/sql_acl.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/log_event.cc b/sql/log_event.cc index d4225b39704..e73a8c5f7f2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -708,7 +708,7 @@ failed my_b_read")); Log_event *res= 0; #ifndef max_allowed_packet THD *thd=current_thd; - uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~0; + uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0; #endif if (data_len > max_allowed_packet) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index a11871c55dc..a062627a0e9 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5172,7 +5172,7 @@ bool mysql_revoke_all(THD *thd, List &list) grant_proc->db, grant_proc->tname, is_proc, - ~0, 1)) + ~(ulong)0, 1)) { revoked= 1; continue; @@ -5240,7 +5240,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name, lex_user.host.length= strlen(grant_proc->host.hostname); if (!replace_routine_table(thd,grant_proc,tables[4].table,lex_user, grant_proc->db, grant_proc->tname, - is_proc, ~0, 1)) + is_proc, ~(ulong)0, 1)) { revoked= 1; continue;