mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
client/mysqladmin.cc: gcc 4.0 fix sql/examples/ha_archive.cc: Bunch of little cleanups from -Wall and gcc 4.0 fixes sql/examples/ha_example.cc: Noticed that the error call was not quite right. sql/examples/ha_tina.cc: Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice). sql/ha_heap.cc: Removed unused variable (-Wall find) sql/item_subselect.cc: Removed unused label. sql/mysqld.cc: Cleanup of unused function and gcc 4.0 bit. sql/opt_range.h: Cleanup for gcc 4.0 sql/repl_failsafe.cc: Cleanup for gcc 4.0 sql/slave.cc: Cleanup for gcc 4.0 sql/sql_acl.cc: Cleanup for gcc 4.0 sql/sql_insert.cc: Cleanedup for gcc 4.0 sql/sql_parse.cc: Cleanedup for gcc 4.0 sql/sql_repl.cc: Removed unused variable sql/sql_select.cc: Cleanedup for gcc 4.0
This commit is contained in:
@@ -1002,7 +1002,7 @@ static void acl_insert_db(const char *user, const char *host, const char *db,
|
||||
ulong acl_get(const char *host, const char *ip,
|
||||
const char *user, const char *db, my_bool db_is_pattern)
|
||||
{
|
||||
ulong host_access= ~0,db_access= 0;
|
||||
ulong host_access= ~(ulong)0,db_access= 0;
|
||||
uint i,key_length;
|
||||
char key[ACL_KEY_LENGTH],*tmp_db,*end;
|
||||
acl_entry *entry;
|
||||
@@ -3673,7 +3673,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
||||
}
|
||||
|
||||
if (replace_user_table(thd, tables[0].table,
|
||||
*lex_user, ~0, 1, 0))
|
||||
*lex_user, ~(ulong)0, 1, 0))
|
||||
{
|
||||
result= -1;
|
||||
continue;
|
||||
@@ -3700,7 +3700,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
||||
if (!strcmp(lex_user->user.str,user) &&
|
||||
!my_strcasecmp(system_charset_info, lex_user->host.str, host))
|
||||
{
|
||||
if (!replace_db_table(tables[1].table, acl_db->db, *lex_user, ~0, 1))
|
||||
if (!replace_db_table(tables[1].table, acl_db->db, *lex_user, ~(ulong)0, 1))
|
||||
{
|
||||
/*
|
||||
Don't increment counter as replace_db_table deleted the
|
||||
@@ -3734,7 +3734,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
||||
if (replace_table_table(thd,grant_table,tables[2].table,*lex_user,
|
||||
grant_table->db,
|
||||
grant_table->tname,
|
||||
~0, 0, 1))
|
||||
~(ulong)0, 0, 1))
|
||||
{
|
||||
result= -1;
|
||||
}
|
||||
@@ -3750,7 +3750,7 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
|
||||
columns,
|
||||
grant_table->db,
|
||||
grant_table->tname,
|
||||
~0, 1))
|
||||
~(ulong)0, 1))
|
||||
{
|
||||
revoked= 1;
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user