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 2017-11-27 14:43:24 +00:00
parent 1029b22feb
commit 1c4968f2f3
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log.cc
View File

@ -2391,7 +2391,7 @@ File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg)
*errmsg = "Could not open log file"; *errmsg = "Could not open log file";
goto err; goto err;
} }
if (init_io_cache(log, file, binlog_file_cache_size, READ_CACHE, 0, 0, if (init_io_cache(log, file, (size_t)binlog_file_cache_size, READ_CACHE, 0, 0,
MYF(MY_WME|MY_DONT_CHECK_FILESIZE))) MYF(MY_WME|MY_DONT_CHECK_FILESIZE)))
{ {
sql_print_error("Failed to create a cache on log (file '%s')", sql_print_error("Failed to create a cache on log (file '%s')",

8
sql/rpl_utility.cc
View File

@ -141,10 +141,10 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
*/ */
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_TINY_BLOB:
return my_set_bits(1 * 8); return (uint32)my_set_bits(1 * 8);
case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
return my_set_bits(3 * 8); return (uint32)my_set_bits(3 * 8);
case MYSQL_TYPE_BLOB: case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_BLOB_COMPRESSED: case MYSQL_TYPE_BLOB_COMPRESSED:
@ -153,11 +153,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 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. 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_LONG_BLOB:
case MYSQL_TYPE_GEOMETRY: case MYSQL_TYPE_GEOMETRY:
return my_set_bits(4 * 8); return (uint32)my_set_bits(4 * 8);
default: default:
return ~(uint32) 0; return ~(uint32) 0;

5
sql/sql_acl.cc
View File

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

2
sql/sql_sequence.cc
View File

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