innodb.result: Fix results after merging changes from MySQL.  Maybe some
changes were incorrectly merged in the past?