MDEV-7011: MAX_STATEMENT_TIME has no effect in a procedure after a previous successful statement

Do not reset timer inside stored procedures and functions.

1 files changed, 33 insertions, 0 deletions

diff --git a/mysql-test/t/max_statement_time.test b/mysql-test/t/max_statement_time.test
index 0356d3caa49..d994f04be83 100644
--- a/mysql-test/t/max_statement_time.test
+++ b/mysql-test/t/max_statement_time.test
@@ -187,3 +187,36 @@ disconnect con1;
 connection default;
 SELECT RELEASE_LOCK('lock');
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-7011:MAX_STATEMENT_TIME has no effect in a procedure after
+--echo # a previous successful statement
+--echo #
+create table t1 (i int);
+insert into t1 values (1),(2),(3),(4);
+insert into t1 select a.* from t1 a, t1 b, t1 c, t1 d, t1 e, t1 f, t1 g;
+delimiter |;
+create procedure pr()
+ begin
+   select 1;
+   select sql_no_cache * from t1 where i > 5;
+   select sql_no_cache * from t1 where i > 5;
+ end |
+delimiter ;|
+set max_statement_time = 0.001;
+--error ER_STATEMENT_TIMEOUT
+call pr();
+drop procedure pr;
+delimiter |;
+create procedure pr()
+ begin
+   select sql_no_cache * from t1 where i > 5;
+   select sql_no_cache * from t1 where i > 5;
+ end |
+delimiter ;|
+set max_statement_time = 0.001;
+--error ER_STATEMENT_TIMEOUT
+call pr();
+set max_statement_time = 0;
+drop procedure pr;
+drop table t1;