summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index bcf534c9e84..3c8689e1588 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2241,7 +2241,7 @@ String *Item_func_hex::val_str(String *str)
return &tmp_value;
}
-int inline hexchar_to_int(char c)
+inline int hexchar_to_int(char c)
{
if (c <= '9' && c >= '0')
return c-'0';
@@ -2721,7 +2721,7 @@ String *Item_func_uuid::val_str(String *str)
{
ulong tmp=sql_rnd_with_mutex();
uchar mac[6];
- int i;
+ unsigned int i;
if (my_gethwaddr(mac))
{
/*