From 547ca1397599fa3acc2feca9d06d1dfdf3d0e971 Mon Sep 17 00:00:00 2001
From: Gleb Shchepa <gshchepa@mysql.com>
Date: Fri, 11 Jul 2008 02:32:54 +0500
Subject: warning elimination

---
 sql/item_strfunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item_strfunc.cc')

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;
     }
-- 
cgit v1.2.1