merge 5.0-bugteam -> 5.1-bugteam

cb201518 · Gleb Shchepa · 678f1a86 · 547ca139 · cb201518
Commit cb201518 authored Jul 11, 2008 by Gleb Shchepa
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_strfunc.cc sql/item_strfunc.cc +1 -1

No files found.
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3445,7 +3445,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);
+      long delta= min(nanoseq, (long) (tv - uuid_time -1));
      tv-= delta;
      nanoseq-= delta;
    }