Commit 9cc31df3 authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files

merge 5.0-bugteam --> 5.1-bugteam

parents d4f4f83e 52f510ef

sql/item_strfunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }