summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorhf@deer.(none) <>2004-03-16 02:04:03 +0400
committerhf@deer.(none) <>2004-03-16 02:04:03 +0400
commite90c78ceb51e1f0e64ceea8ca55ceea1ba040109 (patch)
tree0d6ba1e05381a3bc4db676c17c581f619d4f8916 /sql
parentac9de85b0f3b3236eb37fa5d2b3045a99d2c57e3 (diff)
downloadmariadb-git-e90c78ceb51e1f0e64ceea8ca55ceea1ba040109.tar.gz
Small fix
Diffstat (limited to 'sql')
-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 3c8689e1588..2833e1ca016 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2721,7 +2721,7 @@ String *Item_func_uuid::val_str(String *str)
{
ulong tmp=sql_rnd_with_mutex();
uchar mac[6];
- unsigned int i;
+ int i;
if (my_gethwaddr(mac))
{
/*
@@ -2731,7 +2731,7 @@ String *Item_func_uuid::val_str(String *str)
randominit() here
*/
randominit(&uuid_rand, tmp + (ulong)current_thd, tmp + query_id);
- for (i=0; i < sizeof(mac); i++)
+ for (i=0; i < (int)sizeof(mac); i++)
mac[i]=(uchar)(my_rnd(&uuid_rand)*255);
}
s=clock_seq_and_node_str+sizeof(clock_seq_and_node_str)-1;