bzr push into mysql-5.1 branch (kgeorge:2752 to 2753) Bug#35981

[Georgi Kodinov]

 2753 Georgi Kodinov	2008-10-01
      fixed a win32 warning caused by the fix for bug #35981
modified:
  sql/event_db_repository.cc

 2752 Georgi Kodinov	2008-10-01 [merge]
      merged 5.0-bugteam -> 5.1-bugteam
modified:
  mysql-test/t/distinct.test

=== modified file 'sql/event_db_repository.cc'
--- a/sql/event_db_repository.cc	2008-09-11 07:51:02 +0000
+++ b/sql/event_db_repository.cc	2008-10-01 10:12:08 +0000
@@ -756,7 +756,7 @@ Event_db_repository::update_event(THD *t
   */
 
   if (parse_data->check_dates(thd,
-                              table->field[ET_FIELD_ON_COMPLETION]->val_int()))
+                              (int) table->field[ET_FIELD_ON_COMPLETION]->val_int()))
     goto end;
 
   /* Don't update create on row update. */