into lmy004.:/work/mysql-5.1-events_i_s


sql/event_timed.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged