Commit a603b465 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix warnings

parent 7a01e64c
...@@ -2079,7 +2079,7 @@ uint get_sql_xid(XID *xid, char *buf) ...@@ -2079,7 +2079,7 @@ uint get_sql_xid(XID *xid, char *buf)
MY_INT64_NUM_DECIMAL_DIGITS, -10, xid->formatID); MY_INT64_NUM_DECIMAL_DIGITS, -10, xid->formatID);
} }
return buf - orig_buf; return (uint)(buf - orig_buf);
} }
......
...@@ -254,7 +254,7 @@ void Ack_receiver::run() ...@@ -254,7 +254,7 @@ void Ack_receiver::run()
struct timeval tv= {1, 0}; struct timeval tv= {1, 0};
fds= read_fds; fds= read_fds;
/* select requires max fd + 1 for the first argument */ /* select requires max fd + 1 for the first argument */
ret= select(max_fd+1, &fds, NULL, NULL, &tv); ret= select((int)(max_fd+1), &fds, NULL, NULL, &tv);
if (ret <= 0) if (ret <= 0)
{ {
mysql_mutex_unlock(&m_mutex); mysql_mutex_unlock(&m_mutex);
......
...@@ -5657,7 +5657,7 @@ find_field_in_table(THD *thd, TABLE *table, const char *name, uint length, ...@@ -5657,7 +5657,7 @@ find_field_in_table(THD *thd, TABLE *table, const char *name, uint length,
DBUG_EVALUATE_IF("test_completely_invisible", 0, 1)) DBUG_EVALUATE_IF("test_completely_invisible", 0, 1))
DBUG_RETURN((Field*)0); DBUG_RETURN((Field*)0);
*cached_field_index_ptr= field_ptr - table->field; *cached_field_index_ptr= (uint)(field_ptr - table->field);
field= *field_ptr; field= *field_ptr;
} }
else else
......
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