main.max_statement_time 'innodb_plugin'  w4 [ fail ]
        Test ended at 2015-06-19 16:57:34

CURRENT_TEST: main.max_statement_time
mysqltest: At line 208: query 'call pr()' succeeded - should have failed with errno 1968...

The result from queries just before the failure was:
< snip >
NULL
SELECT RELEASE_LOCK('lock');
RELEASE_LOCK('lock')
1
DROP TABLE t1;
#
# MDEV-7011:MAX_STATEMENT_TIME has no effect in a procedure after
# a previous successful statement
#
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;
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 |
set max_statement_time = 0.001;
call pr();

main.max_statement_time 'innodb_plugin'  w4 [ fail ]
        Test ended at 2015-06-19 17:55:53

CURRENT_TEST: main.max_statement_time
--- /mnt/buildbot/build/mariadb-10.1.5/mysql-test/r/max_statement_time.result	2015-06-19 14:10:56.000000000 +0300
+++ /mnt/buildbot/build/mariadb-10.1.5/mysql-test/r/max_statement_time.reject	2015-06-19 17:55:53.000000000 +0300
@@ -164,6 +164,7 @@
 call pr();
 1
 1
+i
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 drop procedure pr;
 create procedure pr()
@@ -173,6 +174,7 @@
 end |
 set max_statement_time = 0.001;
 call pr();
+i
 ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
 set max_statement_time = 0;
 drop procedure pr;

mysqltest: Result length mismatch

main.max_statement_time 'xtradb'         w1 [ fail ]
        Test ended at 2015-06-19 15:06:29

CURRENT_TEST: main.max_statement_time
mysqltest: At line 209: query 'drop procedure pr' failed: 1968: Query execution was interrupted (max_statement_time exceeded)

The result from queries just before the failure was:
< snip >
DROP TABLE t1;
#
# MDEV-7011:MAX_STATEMENT_TIME has no effect in a procedure after
# a previous successful statement
#
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;
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 |
set max_statement_time = 0.001;
call pr();
1
1
ERROR 70100: Query execution was interrupted (max_statement_time exceeded)
drop procedure pr;