mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
This commit is contained in:
@ -128,7 +128,7 @@ static Exit_status safe_connect();
|
||||
class Load_log_processor
|
||||
{
|
||||
char target_dir_name[FN_REFLEN];
|
||||
int target_dir_name_len;
|
||||
size_t target_dir_name_len;
|
||||
|
||||
/*
|
||||
When we see first event corresponding to some LOAD DATA statement in
|
||||
@ -285,9 +285,9 @@ public:
|
||||
File prepare_new_file_for_old_format(Load_log_event *le, char *filename);
|
||||
Exit_status load_old_format_file(NET* net, const char *server_fname,
|
||||
uint server_fname_len, File file);
|
||||
Exit_status process_first_event(const char *bname, uint blen,
|
||||
Exit_status process_first_event(const char *bname, size_t blen,
|
||||
const uchar *block,
|
||||
uint block_len, uint file_id,
|
||||
size_t block_len, uint file_id,
|
||||
Create_file_log_event *ce);
|
||||
};
|
||||
|
||||
@ -305,7 +305,7 @@ public:
|
||||
File Load_log_processor::prepare_new_file_for_old_format(Load_log_event *le,
|
||||
char *filename)
|
||||
{
|
||||
uint len;
|
||||
size_t len;
|
||||
char *tail;
|
||||
File file;
|
||||
|
||||
@ -319,7 +319,7 @@ File Load_log_processor::prepare_new_file_for_old_format(Load_log_event *le,
|
||||
return -1;
|
||||
}
|
||||
|
||||
le->set_fname_outside_temp_buf(filename,len+strlen(tail));
|
||||
le->set_fname_outside_temp_buf(filename,len+(uint) strlen(tail));
|
||||
|
||||
return file;
|
||||
}
|
||||
@ -411,9 +411,9 @@ Exit_status Load_log_processor::load_old_format_file(NET* net,
|
||||
@retval OK_CONTINUE No error, the program should continue.
|
||||
*/
|
||||
Exit_status Load_log_processor::process_first_event(const char *bname,
|
||||
uint blen,
|
||||
size_t blen,
|
||||
const uchar *block,
|
||||
uint block_len,
|
||||
size_t block_len,
|
||||
uint file_id,
|
||||
Create_file_log_event *ce)
|
||||
{
|
||||
@ -456,7 +456,7 @@ Exit_status Load_log_processor::process_first_event(const char *bname,
|
||||
}
|
||||
|
||||
if (ce)
|
||||
ce->set_fname_outside_temp_buf(fname, strlen(fname));
|
||||
ce->set_fname_outside_temp_buf(fname, (uint) strlen(fname));
|
||||
|
||||
if (my_write(file, (uchar*)block, block_len, MYF(MY_WME|MY_NABP)))
|
||||
{
|
||||
@ -1189,7 +1189,7 @@ static my_time_t convert_str_to_timestamp(const char* str)
|
||||
long dummy_my_timezone;
|
||||
my_bool dummy_in_dst_time_gap;
|
||||
/* We require a total specification (date AND time) */
|
||||
if (str_to_datetime(str, strlen(str), &l_time, 0, &was_cut) !=
|
||||
if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &was_cut) !=
|
||||
MYSQL_TIMESTAMP_DATETIME || was_cut)
|
||||
{
|
||||
error("Incorrect date and time argument: %s", str);
|
||||
|
Reference in New Issue
Block a user