diff options
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 933995c1d22..77e4b24ae41 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2825,9 +2825,9 @@ String *Item_func_uuid::val_str(String *str) uuid_time=tv; pthread_mutex_unlock(&LOCK_uuid_generator); - uint32 time_low= tv & 0xFFFFFFFF; - uint16 time_mid= (tv >> 32) & 0xFFFF; - uint16 time_hi_and_version= (tv >> 48) | UUID_VERSION; + uint32 time_low= (uint32) (tv & 0xFFFFFFFF); + uint16 time_mid= (uint16) ((tv >> 32) & 0xFFFF); + uint16 time_hi_and_version= (uint16) ((tv >> 48) | UUID_VERSION); str->realloc(UUID_LENGTH+1); str->length(UUID_LENGTH); |