mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Post-merge fixes to make tests pass.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Fixing test file to use different positions depending on binlog format. mysql-test/suite/binlog/r/binlog_row_binlog.result: Result change. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result change. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Result change. mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Removing part of test that does not work any more. mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Removing part of test that does not work any more. mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result: Result change. mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: Dropping tables on both master and slave, and not only on slave.
This commit is contained in:
@ -1099,9 +1099,11 @@ master-bin.000001 # Table_map # # table_id: # (test.t1)
|
||||
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
||||
master-bin.000001 # Query # # use `test`; drop table t1
|
||||
master-bin.000001 # Query # # use `test`; create table t1 (a int)
|
||||
master-bin.000001 # Query # # use `test`; BEGIN
|
||||
master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t2` (
|
||||
`a` int(11) DEFAULT NULL
|
||||
)
|
||||
master-bin.000001 # Query # # use `test`; COMMIT
|
||||
master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t3` (
|
||||
`a` int(11) DEFAULT NULL
|
||||
)
|
||||
@ -1124,9 +1126,11 @@ master-bin.000001 # Table_map # # table_id: # (test.t1)
|
||||
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
||||
master-bin.000001 # Query # # use `test`; drop table t1
|
||||
master-bin.000001 # Query # # use `test`; create table t1 (a int)
|
||||
master-bin.000001 # Query # # use `test`; BEGIN
|
||||
master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t2` (
|
||||
`a` int(11) DEFAULT NULL
|
||||
)
|
||||
master-bin.000001 # Query # # use `test`; COMMIT
|
||||
master-bin.000001 # Query # # use `test`; CREATE TABLE IF NOT EXISTS `t3` (
|
||||
`a` int(11) DEFAULT NULL
|
||||
)
|
||||
|
Reference in New Issue
Block a user