diff options
4 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/alter_inplace_perfschema.result b/mysql-test/suite/innodb/r/alter_inplace_perfschema.result index 0944032e45b..38c8ca2f553 100644 --- a/mysql-test/suite/innodb/r/alter_inplace_perfschema.result +++ b/mysql-test/suite/innodb/r/alter_inplace_perfschema.result @@ -9,7 +9,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR go'; SELECT DISTINCT object_name FROM performance_schema.events_waits_history_long WHERE event_name LIKE '%wait%io%file%innodb%innodb_temp_file%'; object_name -MYSQLTEST_VARDIR/tmp/Innodb Merge Temp File +tmp/Innodb Merge Temp File SET DEBUG_SYNC = 'now SIGNAL gone'; SET DEBUG_SYNC = 'RESET'; DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/foreign_key.result b/mysql-test/suite/innodb/r/foreign_key.result index b307c280eb4..0936e984d09 100644 --- a/mysql-test/suite/innodb/r/foreign_key.result +++ b/mysql-test/suite/innodb/r/foreign_key.result @@ -35,3 +35,4 @@ t2 CREATE TABLE `t2` ( CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 DROP TABLE best.t2,t3,t1; +DROP DATABASE best; diff --git a/mysql-test/suite/innodb/t/alter_inplace_perfschema.test b/mysql-test/suite/innodb/t/alter_inplace_perfschema.test index 14db120f6f0..5f1e1f3491d 100644 --- a/mysql-test/suite/innodb/t/alter_inplace_perfschema.test +++ b/mysql-test/suite/innodb/t/alter_inplace_perfschema.test @@ -2,6 +2,7 @@ --source include/have_perfschema.inc --source include/have_debug.inc --source include/have_debug_sync.inc +--source include/not_embedded.inc connect (ddl, localhost, root,,); update performance_schema.setup_instruments set enabled='yes'; @@ -23,7 +24,7 @@ send ALTER TABLE t1 ADD INDEX(b), ALGORITHM=INPLACE; connection default; SET DEBUG_SYNC = 'now WAIT_FOR go'; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--replace_regex /.*[\\\/]tmp/tmp/ SELECT DISTINCT object_name FROM performance_schema.events_waits_history_long WHERE event_name LIKE '%wait%io%file%innodb%innodb_temp_file%'; diff --git a/mysql-test/suite/innodb/t/foreign_key.test b/mysql-test/suite/innodb/t/foreign_key.test index d9ee3ced8e5..25c19a79529 100644 --- a/mysql-test/suite/innodb/t/foreign_key.test +++ b/mysql-test/suite/innodb/t/foreign_key.test @@ -24,6 +24,10 @@ LOCK TABLE staff WRITE; UNLOCK TABLES; DROP TABLES staff, store; +--disable_query_log +call mtr.add_suppression("InnoDB: Error; possible reasons:"); +--enable_query_log + CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE DATABASE best; CREATE TABLE t3 (a INT PRIMARY KEY, @@ -34,3 +38,4 @@ FOREIGN KEY (a) REFERENCES t1(a)) ENGINE=InnoDB; RENAME TABLE best.t2 TO test.t2; SHOW CREATE TABLE best.t2; DROP TABLE best.t2,t3,t1; +DROP DATABASE best; |