mysql-test/mysql-test-run.pl:
  Fix typo or bad merge (if -> elsif)
sql/sql_yacc.yy:
  Fix apparent bad merge: add ';' before ev_schedule_time: rule.