summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2018-08-03 22:39:57 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2018-08-03 22:39:57 +0200
commit7749745b7d688bd35d92219869f93dd0b44117fc (patch)
treeb5465144b2cac6dfdf5743aaa4bb6f17a13b17e2 /sql/item_strfunc.cc
parentaab5c557cfdf4a155e5eab69d0979bcb4b26c710 (diff)
downloadmariadb-git-7749745b7d688bd35d92219869f93dd0b44117fc.tar.gz
Fix of type, to make windows compiler happy.
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
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)))))