Commit 504f7e2d authored by Marc Alff's avatar Marc Alff

Merge

parents 0816ee6d 52f510ef
......@@ -3333,7 +3333,7 @@ String *Item_func_uuid::val_str(String *str)
/*
-1 so we won't make tv= uuid_time for nanoseq >= (tv - uuid_time)
*/
long delta= min(nanoseq, tv - uuid_time -1);
ulong delta= min(nanoseq, (ulong) (tv - uuid_time -1));
tv-= delta;
nanoseq-= delta;
}
......
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