mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 5.0-bugteam -> 5.1-bugteam

Browse source
This commit is contained in:
Gleb Shchepa 2008-07-11 02:47:23 +05:00
commit cb201518b3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/item_strfunc.cc
View file

@ -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) -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; tv-= delta;
nanoseq-= delta; nanoseq-= delta;
} }