Skip to content

Commit dc68195

Browse files
committed
events in perfschema tests: use ON COMPLETION NOT PRESERVE
when the execution is very slow, under valgrind, the event might manage to fire more than once, making the test to fail
1 parent 49f2e9f commit dc68195

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

mysql-test/suite/perfschema/include/program_execution.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SET GLOBAL event_scheduler=ON;
3232

3333
CREATE TABLE table_t(a INT);
3434
DELIMITER |;
35-
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
35+
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
3636
BEGIN
3737
INSERT INTO table_t VALUES(1);
3838
END|

mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Bollywood
145145
# Event
146146
SET GLOBAL event_scheduler=ON;
147147
CREATE TABLE table_t(a INT);
148-
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
148+
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
149149
BEGIN
150150
INSERT INTO table_t VALUES(1);
151151
END|
@@ -165,7 +165,7 @@ statement/sql/call_procedure CALL SampleProc1(30,40,50) NULL NULL 0
165165
statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) NULL NULL 0
166166
statement/sql/call_procedure CALL SampleProc3() NULL NULL 0
167167
statement/sql/call_procedure CALL SampleProc4() NULL NULL 0
168-
statement/sql/create_event CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
168+
statement/sql/create_event CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
169169
BEGIN
170170
INSERT INTO table_t VALUES(1);
171171
END NULL NULL 0

mysql-test/suite/perfschema/r/statement_program_non_nested.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Bollywood
145145
# Event
146146
SET GLOBAL event_scheduler=ON;
147147
CREATE TABLE table_t(a INT);
148-
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
148+
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
149149
BEGIN
150150
INSERT INTO table_t VALUES(1);
151151
END|
@@ -182,7 +182,7 @@ statement/sql/call_procedure CALL SampleProc1(30,40,50) stored_programs NULL NUL
182182
statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) stored_programs NULL NULL NULL NULL 0
183183
statement/sql/call_procedure CALL SampleProc3() stored_programs NULL NULL NULL NULL 0
184184
statement/sql/call_procedure CALL SampleProc4() stored_programs NULL NULL NULL NULL 0
185-
statement/sql/create_event CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
185+
statement/sql/create_event CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
186186
BEGIN
187187
INSERT INTO table_t VALUES(1);
188188
END stored_programs NULL NULL NULL NULL 0
@@ -553,7 +553,7 @@ Bollywood
553553
# Event
554554
SET GLOBAL event_scheduler=ON;
555555
CREATE TABLE table_t(a INT);
556-
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
556+
CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND ON COMPLETION NOT PRESERVE DO
557557
BEGIN
558558
INSERT INTO table_t VALUES(1);
559559
END|

0 commit comments

Comments
 (0)