mysql-test/r/rpl_switch_stm_row_mixed.result:
  Result change
sql/sql_class.h:
  Post-merge fixes.