Commit b18259ec authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Compiling - Fix MSVC compile warnings, on x86

parent 029e2a5f
...@@ -3282,10 +3282,12 @@ handlerton *ha_partition::get_def_part_engine(const char *name) ...@@ -3282,10 +3282,12 @@ handlerton *ha_partition::get_def_part_engine(const char *name)
goto err; goto err;
if (state.st_size <= 64) if (state.st_size <= 64)
goto err; goto err;
if ((ulonglong)state.st_size >= SIZE_T_MAX) /* Whole file need to fit into memory*/
goto err;
if (!(frm_image= (uchar*)my_malloc(key_memory_Partition_share, if (!(frm_image= (uchar*)my_malloc(key_memory_Partition_share,
state.st_size, MYF(MY_WME)))) (size_t)state.st_size, MYF(MY_WME))))
goto err; goto err;
if (mysql_file_read(file, frm_image, state.st_size, MYF(MY_NABP))) if (mysql_file_read(file, frm_image, (size_t)state.st_size, MYF(MY_NABP)))
goto err; goto err;
if (frm_image[64] != '/') if (frm_image[64] != '/')
......
...@@ -2168,7 +2168,7 @@ static ulint page_cleaner_flush_pages_recommendation(ulint last_pages_in, ...@@ -2168,7 +2168,7 @@ static ulint page_cleaner_flush_pages_recommendation(ulint last_pages_in,
sum_pages += last_pages_in; sum_pages += last_pages_in;
const ulint time_elapsed = std::max<ulint>(curr_time - prev_time, 1); const ulint time_elapsed = std::max<ulint>(ulint(curr_time - prev_time), 1);
/* We update our variables every innodb_flushing_avg_loops /* We update our variables every innodb_flushing_avg_loops
iterations to smooth out transition in workload. */ iterations to smooth out transition in workload. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment