diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-07 11:37:38 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-07 11:37:38 +0000 |
| commit | a603b4659360cf43919d1dfa3e9bc68b93911cb6 (patch) | |
| tree | dc3190ad197515b16af0582adbeee34c068f300a | |
| parent | 7a01e64c3a94c8bcf7a4fd50c070f8801f094649 (diff) | |
| download | mariadb-git-a603b4659360cf43919d1dfa3e9bc68b93911cb6.tar.gz | |
Fix warnings
| -rw-r--r-- | sql/handler.cc | 2 | ||||
| -rw-r--r-- | sql/semisync_master_ack_receiver.cc | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 4a40a0256f7..b16f8b88c20 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2079,7 +2079,7 @@ uint get_sql_xid(XID *xid, char *buf) MY_INT64_NUM_DECIMAL_DIGITS, -10, xid->formatID); } - return buf - orig_buf; + return (uint)(buf - orig_buf); } diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_receiver.cc index f986c629f65..90d2190ef2c 100644 --- a/sql/semisync_master_ack_receiver.cc +++ b/sql/semisync_master_ack_receiver.cc @@ -254,7 +254,7 @@ void Ack_receiver::run() struct timeval tv= {1, 0}; fds= read_fds; /* 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) { mysql_mutex_unlock(&m_mutex); diff --git a/sql/sql_base.cc b/sql/sql_base.cc index af6012a3e2b..a441b0ef6a6 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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_RETURN((Field*)0); - *cached_field_index_ptr= field_ptr - table->field; + *cached_field_index_ptr= (uint)(field_ptr - table->field); field= *field_ptr; } else |