Fix for

bug#26338 events_bugs.test fail on Debian
and
bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist"
parent 61276df0
...@@ -557,4 +557,4 @@ CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1; ...@@ -557,4 +557,4 @@ CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ENDS NOW() DO SELECT 1' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ENDS NOW() DO SELECT 1' at line 1
CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1; CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STARTS NOW() ENDS NOW() DO SELECT 1' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'STARTS NOW() ENDS NOW() DO SELECT 1' at line 1
drop database events_test; DROP DATABASE events_test;
...@@ -451,6 +451,10 @@ set global event_scheduler=off; ...@@ -451,6 +451,10 @@ set global event_scheduler=off;
--echo "Should have only our process now:" --echo "Should have only our process now:"
select /*4*/ user, host, db, command, state, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info; select /*4*/ user, host, db, command, state, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
drop event закачка21; drop event закачка21;
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
#### ####
# Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement # Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement
...@@ -725,4 +729,14 @@ drop table t1| ...@@ -725,4 +729,14 @@ drop table t1|
drop event e1| drop event e1|
delimiter ;| delimiter ;|
#
# End of tests
#
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
drop database events_test; drop database events_test;
...@@ -648,7 +648,15 @@ CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1; ...@@ -648,7 +648,15 @@ CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1;
--error ER_PARSE_ERROR --error ER_PARSE_ERROR
CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1; CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1;
# #
# End of tests # End of tests
# #
drop database events_test;
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
DROP DATABASE events_test;
...@@ -101,8 +101,14 @@ disconnect ev_con1; ...@@ -101,8 +101,14 @@ disconnect ev_con1;
connection default; connection default;
DROP USER ev_test@localhost; DROP USER ev_test@localhost;
DROP DATABASE events_test2; DROP DATABASE events_test2;
# #
## EVENTS grants test end # End of tests
# #
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
DROP DATABASE events_test; DROP DATABASE events_test;
...@@ -107,4 +107,10 @@ SET SESSION long_query_time =@old_session_long_query_time; ...@@ -107,4 +107,10 @@ SET SESSION long_query_time =@old_session_long_query_time;
DROP DATABASE events_test; DROP DATABASE events_test;
SET GLOBAL event_scheduler=off; SET GLOBAL event_scheduler=off;
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
...@@ -106,3 +106,13 @@ DROP TABLE table_3; ...@@ -106,3 +106,13 @@ DROP TABLE table_3;
DROP TABLE table_4; DROP TABLE table_4;
DROP DATABASE events_test; DROP DATABASE events_test;
SET GLOBAL event_scheduler=OFF; SET GLOBAL event_scheduler=OFF;
#
# End of tests
#
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
...@@ -133,4 +133,5 @@ DROP USER event_user3@localhost; ...@@ -133,4 +133,5 @@ DROP USER event_user3@localhost;
# #
# DROP DATABASE test end (bug #16406) # DROP DATABASE test end (bug #16406)
# #
DROP DATABASE events_test; DROP DATABASE events_test;
...@@ -288,7 +288,11 @@ DROP TABLE t_step; ...@@ -288,7 +288,11 @@ DROP TABLE t_step;
DROP DATABASE mysqltest_db1; DROP DATABASE mysqltest_db1;
--disable_query_log --disable_query_log
eval USE $old_db; eval USE $old_db;
--enable_query_log
--enable_query_log
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='mysqltest_db1' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
--echo End of 5.1 tests. --echo End of 5.1 tests.
...@@ -111,5 +111,11 @@ commit work; ...@@ -111,5 +111,11 @@ commit work;
# #
# Cleanup # Cleanup
# #
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
drop database events_test; drop database events_test;
...@@ -57,5 +57,10 @@ drop database mysqltest_db2; ...@@ -57,5 +57,10 @@ drop database mysqltest_db2;
# #
# Cleanup # Cleanup
# #
let $wait_condition=
select count(*) = 0 from information_schema.processlist
where db='events_test' and command = 'Connect' and user=current_user();
--source include/wait_condition.inc
drop database events_test; drop database events_test;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment