bzr push into mysql-5.0 branch (gshchepa:2645 to 2646)

[Gleb Shchepa]

 2646 Gleb Shchepa	2008-07-11
      warning elimination
modified:
  sql/item_strfunc.cc

 2645 Tatiana A. Nurnberg	2008-07-10 [merge]
      auto-merge
modified:
  configure.in
  mysql-test/suite/funcs_1/datadict/charset_collation.inc
  mysql-test/suite/funcs_1/t/charset_collation_1.test
  mysql-test/suite/funcs_1/t/charset_collation_3.test
  mysql-test/suite/funcs_2/charset/charset_master.test
  mysql-test/suite/funcs_2/t/innodb_charset.test
  mysql-test/suite/funcs_2/t/memory_charset.test
  mysql-test/suite/funcs_2/t/myisam_charset.test
  mysql-test/suite/funcs_2/t/ndb_charset.test
  support-files/my-huge.cnf.sh
  support-files/my-innodb-heavy-4G.cnf.sh
  support-files/my-large.cnf.sh
  support-files/my-medium.cnf.sh
  support-files/my-small.cnf.sh

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2008-07-10 01:58:30 +0000
+++ b/sql/item_strfunc.cc	2008-07-10 21:32:54 +0000
@@ -3333,7 +3333,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, tv - uuid_time -1);
+      long delta= min(nanoseq, (long) (tv - uuid_time -1));
       tv-= delta;
       nanoseq-= delta;
     }