diff --git a/sql/handler.cc b/sql/handler.cc index 34182bb7854..34c24dbb934 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6542,7 +6542,7 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h, uchar *new_r DBUG_ASSERT(!my_strcasecmp(system_charset_info, "left", fnc->func_name())); DBUG_ASSERT(fnc->arguments()[0]->type() == Item::FIELD_ITEM); t_field= static_cast(fnc->arguments()[0])->field; - longlong length= fnc->arguments()[1]->val_int(); + uint length= (uint)fnc->arguments()[1]->val_int(); if (t_field->cmp_max(t_field->ptr, t_field->ptr + diff, length)) is_same= false; } diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 32f69d3585d..edd0b95fca0 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4097,9 +4097,9 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, } } /* We can not store key_part_length more then 2^16 - 1 in frm */ - if (is_hash_field_needed && column->length > UINT16_MAX) + if (is_hash_field_needed && column->length > UINT_MAX16) { - my_error(ER_TOO_LONG_KEYPART, MYF(0), UINT16_MAX); + my_error(ER_TOO_LONG_KEYPART, MYF(0), UINT_MAX16); DBUG_RETURN(TRUE); } else