1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Vladislav Vaintroub 2018-01-05 17:11:37 +00:00
parent e9a2082634
commit 894fbe6862
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/rpl_utility.cc
View File

@ -139,10 +139,10 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
*/
case MYSQL_TYPE_TINY_BLOB:
return my_set_bits(1 * 8);
return (uint32)my_set_bits(1 * 8);
case MYSQL_TYPE_MEDIUM_BLOB:
return my_set_bits(3 * 8);
return (uint32)my_set_bits(3 * 8);
case MYSQL_TYPE_BLOB:
/*
@ -150,11 +150,11 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
blobs are of type MYSQL_TYPE_BLOB. In that case, we have to look
at the length instead to decide what the max display size is.
*/
return my_set_bits(metadata * 8);
return (uint32)my_set_bits(metadata * 8);
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_GEOMETRY:
return my_set_bits(4 * 8);
return (uint32)my_set_bits(4 * 8);
default:
return ~(uint32) 0;

5
sql/sql_acl.cc
View File

@ -7391,9 +7391,8 @@ static bool grant_load(THD *thd,
continue;
}
}
uint type= procs_priv.routine_type()->val_int();
const Sp_handler *sph= Sp_handler::handler((stored_procedure_type)
type);
stored_procedure_type type= (stored_procedure_type)procs_priv.routine_type()->val_int();
const Sp_handler *sph= Sp_handler::handler(type);
if (!sph || !(hash= sph->get_priv_hash()))
{
sql_print_warning("'procs_priv' entry '%s' "

2
sql/sql_sequence.cc
View File

@ -112,7 +112,7 @@ bool sequence_definition::check_and_adjust(bool set_reserved_until)
/* To ensure that cache * real_increment will never overflow */
max_increment= (real_increment ?
labs(real_increment) :
llabs(real_increment) :
MAX_AUTO_INCREMENT_VALUE);
if (max_value >= start &&