diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-07-11 02:47:23 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-07-11 02:47:23 +0500 |
| commit | cb201518b313857ecb221f7e350c6dbbce104786 (patch) | |
| tree | 64546298f23bec7b6179369975d49baeca30ba59 /sql/item_strfunc.cc | |
| parent | 678f1a86de668c7bba3b3bc1384cbd73d8079d83 (diff) | |
| parent | 547ca1397599fa3acc2feca9d06d1dfdf3d0e971 (diff) | |
| download | mariadb-git-cb201518b313857ecb221f7e350c6dbbce104786.tar.gz | |
merge 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index fbfd21aa006..c762a6d533f 100644 --- 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; } |