Commit ef4ab5cf authored by Georgi Kodinov's avatar Georgi Kodinov

fixed compilation warnings. addendum to the fix for bug 29125

parent 4a3c0d80
...@@ -373,7 +373,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name, ...@@ -373,7 +373,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
} }
else else
{ {
size_t len; int len;
/* /*
mysql_upgrade was run absolutely or relatively. We can find a sibling mysql_upgrade was run absolutely or relatively. We can find a sibling
......
...@@ -223,7 +223,7 @@ base64_decode(const char *src_base, size_t len, ...@@ -223,7 +223,7 @@ base64_decode(const char *src_base, size_t len,
The variable 'i' is set to 'len' when padding has been read, so it The variable 'i' is set to 'len' when padding has been read, so it
does not actually reflect the number of bytes read from 'src'. does not actually reflect the number of bytes read from 'src'.
*/ */
return i != len ? -1 : (uint) (d - dst_base); return i != len ? -1 : (int) (d - dst_base);
} }
......
...@@ -1289,7 +1289,6 @@ void Log_event::print_header(IO_CACHE* file, ...@@ -1289,7 +1289,6 @@ void Log_event::print_header(IO_CACHE* file,
ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6],
ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13],
ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]); ptr[14], ptr[15], ptr[16], ptr[17], ptr[18]);
DBUG_ASSERT(bytes_written >= 0);
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf)); DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
my_b_write(file, (uchar*) emit_buf, bytes_written); my_b_write(file, (uchar*) emit_buf, bytes_written);
ptr += LOG_EVENT_MINIMAL_HEADER_LEN; ptr += LOG_EVENT_MINIMAL_HEADER_LEN;
...@@ -1320,7 +1319,6 @@ void Log_event::print_header(IO_CACHE* file, ...@@ -1320,7 +1319,6 @@ void Log_event::print_header(IO_CACHE* file,
"# %8.8lx %-48.48s |%16s|\n", "# %8.8lx %-48.48s |%16s|\n",
(unsigned long) (hexdump_from + (i & 0xfffffff0)), (unsigned long) (hexdump_from + (i & 0xfffffff0)),
hex_string, char_string); hex_string, char_string);
DBUG_ASSERT(bytes_written >= 0);
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf)); DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
my_b_write(file, (uchar*) emit_buf, bytes_written); my_b_write(file, (uchar*) emit_buf, bytes_written);
hex_string[0]= 0; hex_string[0]= 0;
...@@ -1340,7 +1338,6 @@ void Log_event::print_header(IO_CACHE* file, ...@@ -1340,7 +1338,6 @@ void Log_event::print_header(IO_CACHE* file,
"# %8.8lx %-48.48s |%s|\n", "# %8.8lx %-48.48s |%s|\n",
(unsigned long) (hexdump_from + (i & 0xfffffff0)), (unsigned long) (hexdump_from + (i & 0xfffffff0)),
hex_string, char_string); hex_string, char_string);
DBUG_ASSERT(bytes_written >= 0);
DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf)); DBUG_ASSERT(static_cast<size_t>(bytes_written) < sizeof(emit_buf));
my_b_write(file, (uchar*) emit_buf, bytes_written); my_b_write(file, (uchar*) emit_buf, bytes_written);
} }
......
...@@ -1114,7 +1114,7 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d", ...@@ -1114,7 +1114,7 @@ def_week_frmt: %lu, in_trans: %d, autocommit: %d",
{ {
memcpy(thd->query+thd->query_length+1, thd->db, thd->db_length); memcpy(thd->query+thd->query_length+1, thd->db, thd->db_length);
DBUG_PRINT("qcache", ("database: %s length: %u", DBUG_PRINT("qcache", ("database: %s length: %u",
thd->db, thd->db_length)); thd->db, (unsigned) thd->db_length));
} }
else else
{ {
...@@ -1307,7 +1307,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) ...@@ -1307,7 +1307,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
{ {
memcpy(sql+query_length+1, thd->db, thd->db_length); memcpy(sql+query_length+1, thd->db, thd->db_length);
DBUG_PRINT("qcache", ("database: '%s' length: %u", DBUG_PRINT("qcache", ("database: '%s' length: %u",
thd->db, thd->db_length)); thd->db, (unsigned)thd->db_length));
} }
else else
{ {
......
...@@ -1290,8 +1290,8 @@ FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name, ...@@ -1290,8 +1290,8 @@ FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name,
(uchar*) server_name, (uchar*) server_name,
server_name_length))) server_name_length)))
{ {
DBUG_PRINT("info", ("server_name %s length %d not found!", DBUG_PRINT("info", ("server_name %s length %u not found!",
server_name, server_name_length)); server_name, (unsigned) server_name_length));
server= (FOREIGN_SERVER *) NULL; server= (FOREIGN_SERVER *) NULL;
} }
/* otherwise, make copy of server */ /* otherwise, make copy of server */
......
...@@ -61,7 +61,8 @@ static void make_unique_view_field_name(Item *target, ...@@ -61,7 +61,8 @@ static void make_unique_view_field_name(Item *target,
char *name= (target->orig_name ? char *name= (target->orig_name ?
target->orig_name : target->orig_name :
target->name); target->name);
size_t name_len, attempt; size_t name_len;
uint attempt;
char buff[NAME_LEN+1]; char buff[NAME_LEN+1];
List_iterator_fast<Item> itc(item_list); List_iterator_fast<Item> itc(item_list);
......
...@@ -82,7 +82,7 @@ char Transparent_file::get_value(off_t offset) ...@@ -82,7 +82,7 @@ char Transparent_file::get_value(off_t offset)
size_t bytes_read; size_t bytes_read;
/* check boundaries */ /* check boundaries */
if ((lower_bound <= offset) && (offset < upper_bound)) if ((lower_bound <= offset) && (((my_off_t) offset) < upper_bound))
return buff[offset - lower_bound]; return buff[offset - lower_bound];
VOID(my_seek(filedes, offset, MY_SEEK_SET, MYF(0))); VOID(my_seek(filedes, offset, MY_SEEK_SET, MYF(0)));
...@@ -95,7 +95,7 @@ char Transparent_file::get_value(off_t offset) ...@@ -95,7 +95,7 @@ char Transparent_file::get_value(off_t offset)
upper_bound= lower_bound + bytes_read; upper_bound= lower_bound + bytes_read;
/* end of file */ /* end of file */
if (upper_bound == offset) if (upper_bound == (my_off_t) offset)
return 0; return 0;
return buff[0]; return buff[0];
......
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