diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-07-11 04:52:50 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-07-11 04:52:50 +0500 |
| commit | 9cc31df3b4528d085598858d116616e0478f1910 (patch) | |
| tree | 8ef021fb06a80833b9b0fe02a31415f89b172e37 /sql/item_strfunc.cc | |
| parent | d4f4f83eb18709711e2e261bd0733ebb9fc3b7ba (diff) | |
| parent | 52f510ef22d1ebb518467bdb0d29f3cb7a3e77b1 (diff) | |
| download | mariadb-git-9cc31df3b4528d085598858d116616e0478f1910.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 c762a6d533f..4e01728f71c 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, (long) (tv - uuid_time -1)); + ulong delta= min(nanoseq, (ulong) (tv - uuid_time -1)); tv-= delta; nanoseq-= delta; } |