diff options
| -rw-r--r-- | sql/field.cc | 2 | ||||
| -rw-r--r-- | sql/item_uniq.h | 2 | ||||
| -rw-r--r-- | sql/sql_derived.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 7b21f179660..9697b6c158e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1913,7 +1913,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs) char *end; tmp= cs->scan(cs, from, from+len, MY_SEQ_SPACES); - len-= tmp; + len-= (uint)tmp; from+= tmp; my_errno=0; if (unsigned_flag) diff --git a/sql/item_uniq.h b/sql/item_uniq.h index ac004e747f8..5ffd10be7a5 100644 --- a/sql/item_uniq.h +++ b/sql/item_uniq.h @@ -50,7 +50,7 @@ public: fixed= 1; return 0; } - Item_sum *copy_or_same(THD* thd) + Item *copy_or_same(THD* thd) { return new Item_sum_unique_users(thd, *this); } diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index d1a232c35b6..ced3e3d4a98 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -71,7 +71,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t) TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first; TMP_TABLE_PARAM tmp_table_param; bool is_union= sl->next_select() && sl->next_select()->linkage == UNION_TYPE; - bool is_subsel= sl->first_inner_unit(); + bool is_subsel= sl->first_inner_unit() ? 1: 0; SELECT_LEX_NODE *save_current_select= lex->current_select; DBUG_ENTER("mysql_derived"); |