revision-id: 7749745b7d688bd35d92219869f93dd0b44117fc (mariadb-10.3.7-107-g7749745b7d6) parent(s): aab5c557cfdf4a155e5eab69d0979bcb4b26c710 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-08-03 22:39:57 +0200 message: Fix of type, to make windows compiler happy. --- sql/item_strfunc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 1590576ddf4..51723a25dee 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1570,7 +1570,7 @@ String *Item_str_conv::val_str(String *str) { DBUG_ASSERT(fixed == 1); String *res; - uint32 alloced_length, len; + size_t alloced_length, len; if ((null_value= (!(res= args[0]->val_str(&tmp_value)) || str->alloc((alloced_length= res->length() * multiply)))))