Commit graph

3 commits

Author SHA1 Message Date
unknown
f5ef5cb0af 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 [!]
2007-07-30 13:32:15 +02:00
unknown
db55082aa0 Fix for bug #28772: rpl_row_until fails in pushbuild
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.


mysql-test/include/wait_for_slave_io_to_stop.inc:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_to_start.inc:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - changed to use query_vertical so that it is easier to read the output.
mysql-test/include/wait_for_slave_to_stop.inc:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - changed to use query_vertical so that it is easier to read the output.
mysql-test/t/rpl_row_until.test:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
      include/wait_for_slave_sql_to_stop.inc to be more predictable.
mysql-test/t/rpl_stm_until.test:
  Fix for bug #28772: rpl_row_until fails in pushbuild
    - 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
      include/wait_for_slave_sql_to_stop.inc to be more predictable.
2007-06-19 16:06:11 +05:00
unknown
b55468d713 Updated patch for Bug#28497 based off of Magnus's review
mysql-test/include/wait_for_slave_io_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_to_start.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/t/rpl_critical_errors.test:
  Updated to use new tool(s)
mysql-test/t/rpl_dual_pos_advance.test:
  Updated to use new tool(s)
mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s)
mysql-test/t/rpl_rotate_logs.test:
  Updated to use new tool(s)
mysql-test/t/rpl_row_inexist_tbl.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  Updated to use new tool(s)
2007-06-13 05:52:43 +02:00