WL#3228 (RBR using different table defs on slave/master):

Fixing tests and results to work when replicating to fewer columns on
slave than on master. One test that previously should fail, now works,
and some log positions have changed as a result of adding metadata to
the events.


mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Replication to fewer columns on slave now works.
mysql-test/include/wait_for_slave_to_stop.inc:
  Adding subsitutions for SHOW SLAVE STATUS
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Result change.
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_slave_skip.result:
  Result change.
mysql-test/suite/rpl/t/rpl_skip_error-slave.opt:
  Error number changed [!]

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/include/wait_for_slave_to_stop.inc b/mysql-test/include/wait_for_slave_to_stop.inc
index 95e0ac67dd5..5bd2d0338f8 100644
--- a/mysql-test/include/wait_for_slave_to_stop.inc
+++ b/mysql-test/include/wait_for_slave_to_stop.inc
@@ -28,6 +28,8 @@ while ($run)
   sleep 0.1;
   if (!$counter){
     --echo "Failed while waiting for slave to stop"
+    --replace_result $MASTER_MYPORT MASTER_PORT
+    --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
     query_vertical SHOW SLAVE STATUS;
     exit;
   }