diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-07-30 13:32:15 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-07-30 13:32:15 +0200 |
| commit | f5ef5cb0af73db3b6faa90181d12e705cf431199 (patch) | |
| tree | 1c32813436b50c59424308a83133d05766c786fa /mysql-test/extra | |
| parent | d4671354f19e1838b3a7c3d2c2d482b196f1248f (diff) | |
| download | mariadb-git-f5ef5cb0af73db3b6faa90181d12e705cf431199.tar.gz | |
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 [!]
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_tabledefs.test | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test index 3903c0b0be1..4a081a02de4 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test +++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test @@ -120,19 +120,23 @@ connection slave; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; START SLAVE; +# +# Replicating to tables with fewer columns at the end works as of WL#3228 +# connection master; INSERT INTO t9 VALUES (2); sync_slave_with_master; # Now slave is guaranteed to be running connection master; +--echo **** On Master **** INSERT INTO t2 VALUES (2,4); -connection slave; ---source include/wait_for_slave_sql_to_stop.inc +SELECT * FROM t2; +sync_slave_with_master; +--echo **** On Slave **** +SELECT * FROM t2; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --query_vertical SHOW SLAVE STATUS -SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; -START SLAVE; connection master; INSERT INTO t9 VALUES (4); @@ -179,7 +183,7 @@ START SLAVE; connection master; INSERT INTO t9 VALUES (6); sync_slave_with_master; ---replace_result $MASTER_MYPORT MASTER_PORT +--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --query_vertical SHOW SLAVE STATUS |