Merge polly.local:/tmp/maint/bug22728/my50-bug22728

into  polly.local:/tmp/maint/bug22728/my51-bug22728


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/handler.cc:
  Auto merged