database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix buildbot Windows and bintar compile failure

Browse Source
This commit is contained in:
sachin
2019-02-22 14:58:21 +05:30
committed by Sergei Golubchik
parent bd7f7b1416
commit 0372f98cb5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -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(!my_strcasecmp(system_charset_info, "left", fnc->func_name()));
DBUG_ASSERT(fnc->arguments()[0]->type() == Item::FIELD_ITEM); DBUG_ASSERT(fnc->arguments()[0]->type() == Item::FIELD_ITEM);
t_field= static_cast<Item_field *>(fnc->arguments()[0])->field; t_field= static_cast<Item_field *>(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)) if (t_field->cmp_max(t_field->ptr, t_field->ptr + diff, length))
is_same= false; is_same= false;
} }

4
sql/sql_table.cc
View File

@ -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 */ /* 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); DBUG_RETURN(TRUE);
} }
else else