diff options
| author | unknown <skozlov/ksm@mysql.com/virtop.localdomain> | 2007-06-29 21:09:00 +0400 |
|---|---|---|
| committer | unknown <skozlov/ksm@mysql.com/virtop.localdomain> | 2007-06-29 21:09:00 +0400 |
| commit | eb36fd973575c9636e16f8a7a49676c10ccc878e (patch) | |
| tree | dd2769c070f08296704c0e71587c1d36ac84a8ff /mysql-test/suite/rpl/include | |
| parent | 575bb5add2ac33aba5fa5185497ab7e1e029f18f (diff) | |
| download | mariadb-git-eb36fd973575c9636e16f8a7a49676c10ccc878e.tar.gz | |
Bug#29363
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
removed Server version from SHOW BINLOG EVENTS
mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result:
updated result file
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test:
skip test for row/statement
mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test:
skip test for row/statement
Diffstat (limited to 'mysql-test/suite/rpl/include')
| -rw-r--r-- | mysql-test/suite/rpl/include/rpl_mixed_ddl.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/include/rpl_mixed_dml.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc b/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc index 7ea92a5cc1e..0b13116300e 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_ddl.inc @@ -67,7 +67,7 @@ ALTER TABLE t2 DROP COLUMN d; --echo --echo ******************** SHOW BINLOG EVENTS ******************** --replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ +--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ show binlog events from 1; sync_slave_with_master; # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID diff --git a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc index c79eb756c7f..cc225d1bb28 100644 --- a/mysql-test/suite/rpl/include/rpl_mixed_dml.inc +++ b/mysql-test/suite/rpl/include/rpl_mixed_dml.inc @@ -326,8 +326,8 @@ DROP VIEW v2; --echo --echo ******************** SHOW BINLOG EVENTS ******************** --replace_column 2 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/ -show binlog events from 102; +--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/ +show binlog events from 1; sync_slave_with_master; # as we're using UUID we don't SELECT but use "diff" like in rpl_row_UUID --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test_rpl > $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql |