Post-merge fix.


mysql-test/t/disabled.def:
  Post-merge fix.
mysql-test/r/sp.result:
  Post-merge fix.
sql/sql_yacc.yy:
  Post-merge fix.