5 files changed, 9 insertions, 5 deletions
diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/r/max_statement_time.result
index c0cffb27a37..e445907255b 100644
--- a/mysql-test/r/max_statement_time.result
+++ b/mysql-test/r/max_statement_time.result
@@ -159,6 +159,7 @@ begin
 select 1;
 select sql_no_cache * from t1 where i > 5;
 select sql_no_cache * from t1 where i > 5;
+select sleep(2);
 end |
 set max_statement_time = 0.001;
 call pr();
@@ -170,6 +171,7 @@ create procedure pr()
 begin
 select sql_no_cache * from t1 where i > 5;
 select sql_no_cache * from t1 where i > 5;
+select sleep(2);
 end |
 set max_statement_time = 0.001;
 call pr();
diff --git a/mysql-test/r/repair_symlink-5543.result b/mysql-test/r/repair_symlink-5543.result
index 051c9ca3472..98ded32686e 100644
--- a/mysql-test/r/repair_symlink-5543.result
+++ b/mysql-test/r/repair_symlink-5543.result
@@ -2,13 +2,12 @@ create table t1 (a int) engine=myisam data directory='MYSQL_TMP_DIR';
 insert t1 values (1);
 repair table t1;
 Table	Op	Msg_type	Msg_text
-test.t1	repair	error	Can't create new tempfile: 'MYSQL_TMP_DIR/t1.TMD'
-test.t1	repair	status	Operation failed
+test.t1	repair	status	OK
 drop table t1;
 create table t2 (a int) engine=aria data directory='MYSQL_TMP_DIR';
 insert t2 values (1);
 repair table t2;
 Table	Op	Msg_type	Msg_text
-test.t2	repair	error	Can't create new tempfile: 'MYSQL_TMP_DIR/t2.TMD'
-test.t2	repair	status	Operation failed
+test.t2	repair	status	OK
 drop table t2;
+foobar5543
diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def
index 6e8f566452c..8c0d47983fd 100644
--- a/mysql-test/suite/encryption/disabled.def
+++ b/mysql-test/suite/encryption/disabled.def
@@ -13,3 +13,5 @@
 innodb_scrub : MDEV-8139
 innodb_scrub_compressed : MDEV-8139
 innodb_scrub_background : MDEV-8139
+innodb_encryption-page-compression : Fails with lost connection at line 156
+
diff --git a/mysql-test/t/max_statement_time.test b/mysql-test/t/max_statement_time.test
index d994f04be83..cc8c0ae87a2 100644
--- a/mysql-test/t/max_statement_time.test
+++ b/mysql-test/t/max_statement_time.test
@@ -201,6 +201,7 @@ create procedure pr()
    select 1;
    select sql_no_cache * from t1 where i > 5;
    select sql_no_cache * from t1 where i > 5;
+   select sleep(2);
  end |
 delimiter ;|
 set max_statement_time = 0.001;
@@ -212,6 +213,7 @@ create procedure pr()
  begin
    select sql_no_cache * from t1 where i > 5;
    select sql_no_cache * from t1 where i > 5;
+   select sleep(2);
  end |
 delimiter ;|
 set max_statement_time = 0.001;
diff --git a/mysql-test/t/repair_symlink-5543.test b/mysql-test/t/repair_symlink-5543.test
index bad65a4175a..58cc810b1a9 100644
--- a/mysql-test/t/repair_symlink-5543.test
+++ b/mysql-test/t/repair_symlink-5543.test
@@ -22,5 +22,4 @@ repair table t2;
 drop table t2;
 
 --list_files $MYSQL_TMP_DIR foobar5543
---system rm $MYSQL_TMP_DIR/t1.TMD $MYSQL_TMP_DIR/t2.TMD