Merge mysql.com:/home/mydev/mysql-5.1

into  mysql.com:/home/mydev/mysql-5.1-wl1563

mysql-test/t/mysqltest.test

@@ -1037,7 +1037,7 @@ drop table t1;
 --error 1
 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
 # The .out file should be non existent
---exec test ! -e $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test ! -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;
 
 

sql/event.h

@@ -136,7 +136,7 @@ public:
   init_ends(THD *thd, Item *ends);
   
   void
-  event_timed::init_body(THD *thd);
+  init_body(THD *thd);
 
   void
   init_comment(THD *thd, LEX_STRING *set_comment);