From 7567b9fa10985a57339e8f0dbaf6e654c7f65c93 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 28 Jun 2015 18:51:40 +0200 Subject: [PATCH] update tests to pass --- mysql-test/extra/binlog_tests/database.test | 2 +- mysql-test/suite/rpl/t/rpl_drop_db_fail.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/extra/binlog_tests/database.test b/mysql-test/extra/binlog_tests/database.test index cd0266434ff..05a00c58840 100644 --- a/mysql-test/extra/binlog_tests/database.test +++ b/mysql-test/extra/binlog_tests/database.test @@ -84,7 +84,7 @@ CREATE TABLE t3 (a INT, KEY (a), FOREIGN KEY(a) REFERENCES db1.t2(b)) engine=innodb; RESET MASTER; ---error ER_ROW_IS_REFERENCED +--error ER_ROW_IS_REFERENCED_2 DROP DATABASE db1; # Fails because of the fk SHOW TABLES FROM db1; # t1 was dropped, t2 remains --source include/show_binlog_events.inc # Check that the binlog drops t1 diff --git a/mysql-test/suite/rpl/t/rpl_drop_db_fail.test b/mysql-test/suite/rpl/t/rpl_drop_db_fail.test index f4482064d7b..c13bae1cab3 100644 --- a/mysql-test/suite/rpl/t/rpl_drop_db_fail.test +++ b/mysql-test/suite/rpl/t/rpl_drop_db_fail.test @@ -25,7 +25,7 @@ use db2; CREATE TABLE table_child(id INT PRIMARY KEY, info VARCHAR(20), father_id INT) ENGINE=INNODB; ALTER TABLE table_child ADD CONSTRAINT aaa FOREIGN KEY (father_id) REFERENCES db1.table_father(id); ---error ER_ROW_IS_REFERENCED +--error ER_ROW_IS_REFERENCED_2 DROP DATABASE db1; DROP DATABASE db2; --sync_slave_with_master