summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorGleb Shchepa <gshchepa@mysql.com>2008-07-11 02:32:54 +0500
committerGleb Shchepa <gshchepa@mysql.com>2008-07-11 02:32:54 +0500
commit547ca1397599fa3acc2feca9d06d1dfdf3d0e971 (patch)
treeace15effd71bd402796cbd0fcf2764f6c29ec88f /sql/item_strfunc.cc
parent0617cf0f78fd79e6cf109720f708b98b35e34ce3 (diff)
downloadmariadb-git-547ca1397599fa3acc2feca9d06d1dfdf3d0e971.tar.gz
warning elimination
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 1d447d6e976..c12a1acc980 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3333,7 +3333,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;
}