bzr commit into mysql-5.1 branch (gshchepa:2701)

[Gleb Shchepa]

#At file:///work/bzr/mysql-5.1-bugteam/

 2701 Gleb Shchepa	2008-07-11 [merge]
      merge 5.0-bugteam --> 5.1-bugteam
modified:
  sql/item_strfunc.cc

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2008-07-10 21:47:23 +0000
+++ b/sql/item_strfunc.cc	2008-07-10 23:52:50 +0000
@@ -3445,7 +3445,7 @@ String *Item_func_uuid::val_str(String *
       /*
         -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;
     }