Commit 4c0d9156 authored by unknown's avatar unknown

Small fix

sql/item_strfunc.cc:
  that's the right fix
parent 9eff35de
...@@ -2721,7 +2721,7 @@ String *Item_func_uuid::val_str(String *str) ...@@ -2721,7 +2721,7 @@ String *Item_func_uuid::val_str(String *str)
{ {
ulong tmp=sql_rnd_with_mutex(); ulong tmp=sql_rnd_with_mutex();
uchar mac[6]; uchar mac[6];
unsigned int i; int i;
if (my_gethwaddr(mac)) if (my_gethwaddr(mac))
{ {
/* /*
...@@ -2731,7 +2731,7 @@ String *Item_func_uuid::val_str(String *str) ...@@ -2731,7 +2731,7 @@ String *Item_func_uuid::val_str(String *str)
randominit() here randominit() here
*/ */
randominit(&uuid_rand, tmp + (ulong)current_thd, tmp + query_id); 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); mac[i]=(uchar)(my_rnd(&uuid_rand)*255);
} }
s=clock_seq_and_node_str+sizeof(clock_seq_and_node_str)-1; s=clock_seq_and_node_str+sizeof(clock_seq_and_node_str)-1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment