myisam/myisamdef.h:
  Added missing declaration
mysql-test/r/innodb.result:
  Changed test based on result from changed optimizer
sql/mysql_priv.h:
  Fixed wrong prototype