merge 5.0-bugteam --> 5.1-bugteam

2008-07-11 04:52:50 +05:00 · 2008-07-11 04:52:50 +05:00 · b7ae75b595
commit b7ae75b595
parent cb201518b3 d5077086f7
1 changed files with 1 additions and 1 deletions
--- 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, (long) (tv - uuid_time -1));
+      ulong delta= min(nanoseq, (ulong) (tv - uuid_time -1));
      tv-= delta;
      nanoseq-= delta;
    }