summaryrefslogtreecommitdiff
path: root/mysql-test/t/events.test
diff options
context:
space:
mode:
authorunknown <stewart@willster.(none)>2006-08-15 19:53:16 +0800
committerunknown <stewart@willster.(none)>2006-08-15 19:53:16 +0800
commitbe495c39aac7fe181d5c36f374003a3e39341258 (patch)
tree35e272c91edc00a4f6b8697110b0d17a3d719882 /mysql-test/t/events.test
parentfdc1ee2ce7f832773947e6dc41540eaa4aa85c50 (diff)
downloadmariadb-git-be495c39aac7fe181d5c36f374003a3e39341258.tar.gz
BUG#21647 events tests fails with --with-ndbcluster
ignore the ndb injector thread when selecting from INFORMATION_SCHEMA.PROCESSLIST mysql-test/r/events.result: don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread) mysql-test/r/events_bugs.result: don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread) mysql-test/t/events.test: don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread) mysql-test/t/events_bugs.test: don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)
Diffstat (limited to 'mysql-test/t/events.test')
-rw-r--r--mysql-test/t/events.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/events.test b/mysql-test/t/events.test
index aac13a55dd3..69c0df842eb 100644
--- a/mysql-test/t/events.test
+++ b/mysql-test/t/events.test
@@ -270,7 +270,7 @@ create event закачка on schedule every 10 hour do select get_lock("test_l
select definer, name, db from mysql.event;
--echo "Should be only 1 process"
-select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+select /*1*/ user, host, db, command, state, info from information_schema.processlist where command!='Daemon' and (info is null or info not like '%processlist%') order by info;
select release_lock("test_lock1");
drop event закачка;
--echo "Should have 0 events"
@@ -287,7 +287,7 @@ create event закачка on schedule every 10 hour do select get_lock("test_l
--echo "Let some time pass to the event starts"
--sleep 1
--echo "Should have only 2 processes: the scheduler and the locked event"
-select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;--echo "Release the mutex, the event worker should finish."
+select /*2*/ user, host, db, command, state, info from information_schema.processlist where command!='Daemon' and (info is null or info not like '%processlist%') order by info;--echo "Release the mutex, the event worker should finish."
--echo "Release the mutex, the event worker should finish."
select release_lock("test_lock2");
drop event закачка;
@@ -305,10 +305,10 @@ select get_lock("test_lock2_1", 20);
create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);
--sleep 1
--echo "Should have only 3 processes: the scheduler, our conn and the locked event"
-select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+select /*3*/ user, host, db, command, state, info from information_schema.processlist where command!='Daemon' and (info is null or info not like '%processlist%') order by info;
set global event_scheduler=2;
--echo "Should have only our process now:"
-select /*4*/ user, host, db, command, state, info from information_schema.processlist where 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' and (info is null or info not like '%processlist%') order by info;
drop event закачка21;
####