database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post-merge fixes to make tests pass.

Browse Source 
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:
unknown
2008-01-11 13:25:26 +01:00
parent ac167eca6e
commit 1754c58d99
8 changed files with 492 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result
View File

@ -135,6 +135,5 @@ Last_SQL_Errno 0
Last_SQL_Error
SELECT * FROM tinnodb ORDER BY a;
a
DROP TABLE tmyisam;
DROP TABLE tinnodb;
DROP TABLE tndb;
DROP TABLE tmyisam, tinnodb, tndb;
DROP TABLE tmyisam, tinnodb, tndb;

9
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
View File

@ -116,8 +116,9 @@ query_vertical SHOW SLAVE STATUS;
# the following statement should show that nothing has been replicated
SELECT * FROM tinnodb ORDER BY a;
# clean up
DROP TABLE tmyisam;
DROP TABLE tinnodb;
DROP TABLE tndb;
connection master;
DROP TABLE tmyisam, tinnodb, tndb;
connection slave;
DROP TABLE tmyisam, tinnodb, tndb;