summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/max_statement_time.result2
-rw-r--r--mysql-test/suite/encryption/disabled.def2
-rw-r--r--mysql-test/t/max_statement_time.test2
3 files changed, 6 insertions, 0 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/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;