mysql-test/r/rpl_switch_stm_row_mixed.result:
  post-merge fix
mysql-test/t/rpl_switch_stm_row_mixed.test:
  post-merge fix (and no need to use a table t12 in some place).