bk commit into 5.1 tree (stewart:1.2276) BUG#21647

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-15 19:53:16+08:00, stewart@willster.(none) +4 -0
  BUG#21647 events tests fails with --with-ndbcluster
  
  ignore the ndb injector thread when selecting from INFORMATION_SCHEMA.PROCESSLIST

  mysql-test/r/events.result@stripped, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +4
-4
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/r/events_bugs.result@stripped, 2006-08-15 19:53:13+08:00, stewart@willster.(none)
+5 -5
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/t/events.test@stripped, 2006-08-15 19:53:13+08:00, stewart@willster.(none) +4 -4
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

  mysql-test/t/events_bugs.test@stripped, 2006-08-15 19:53:13+08:00, stewart@willster.(none)
+5 -5
    don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb

--- 1.36/mysql-test/r/events.result	2006-08-15 19:53:22 +08:00
+++ 1.37/mysql-test/r/events.result	2006-08-15 19:53:22 +08:00
@@ -309,7 +309,7 @@
 definer	name	db
 root@localhost	закачка	events_test
 "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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Suspended	NULL
 select release_lock("test_lock1");
@@ -329,7 +329,7 @@
 create event закачка on schedule every 10 hour do select get_lock("test_lock2",
20);
 "Let some time pass to the event starts"
 "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;
+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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 root	localhost	events_test	Connect	User lock	select get_lock("test_lock2", 20)
@@ -345,13 +345,13 @@
 1
 create event закачка21 on schedule every 10 hour do select
get_lock("test_lock2_1", 20);
 "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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)
 set global event_scheduler=2;
 "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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Suspended	NULL
 root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)

--- 1.12/mysql-test/r/events_bugs.result	2006-08-15 19:53:22 +08:00
+++ 1.13/mysql-test/r/events_bugs.result	2006-08-15 19:53:22 +08:00
@@ -50,7 +50,7 @@
 drop table "hashed_num";
 end|
 "Now if everything is fine the event has compiled and is locked
-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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 root	localhost	events_test	Connect	User lock	select get_lock('test_bug16407', 60)
@@ -103,7 +103,7 @@
 get_lock('ee_16407_2', 60)
 1
 set global event_scheduler= 1;
-select /*2*/ user, host, db, command, state, info from information_schema.processlist
where info is null or info not like '%processlist%' order by info;
+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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60)
@@ -112,7 +112,7 @@
 select release_lock('ee_16407_2');
 release_lock('ee_16407_2')
 1
-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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 set global event_scheduler= 2;
@@ -151,7 +151,7 @@
 1
 set global event_scheduler= 1;
 "Should have 2 locked processes"
-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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_5', 60)
@@ -160,7 +160,7 @@
 release_lock('ee_16407_5')
 1
 "Should have 0 processes locked"
-select /*5*/ user, host, db, command, state, info from information_schema.processlist
where info is null or info not like '%processlist%' order by info;
+select /*5*/ 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;
 user	host	db	command	state	info
 event_scheduler	localhost	NULL	Connect	Sleeping	NULL
 select * from events_smode_test order by ev_name, a;

--- 1.32/mysql-test/t/events.test	2006-08-15 19:53:22 +08:00
+++ 1.33/mysql-test/t/events.test	2006-08-15 19:53:22 +08:00
@@ -270,7 +270,7 @@
 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 @@
 --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 @@
 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;
 
 ####

--- 1.9/mysql-test/t/events_bugs.test	2006-08-15 19:53:22 +08:00
+++ 1.10/mysql-test/t/events_bugs.test	2006-08-15 19:53:22 +08:00
@@ -80,7 +80,7 @@
 delimiter ;|
 --sleep 1
 --echo "Now if everything is fine the event has compiled and is locked
-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_bug16407');
 set global event_scheduler= 2;
 select event_schema, event_name, sql_mode from information_schema.events order by
event_schema, event_name;
@@ -122,10 +122,10 @@
 select get_lock('ee_16407_2', 60);
 set global event_scheduler= 1;
 --sleep 1
-select /*2*/ user, host, db, command, state, info from information_schema.processlist
where info is null or info not like '%processlist%' order by info;
+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;
 select release_lock('ee_16407_2');
 --sleep 2
-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;
 select * from events_smode_test order by ev_name, a;
 --echo "OK, last check before we drop them"
@@ -157,11 +157,11 @@
 set global event_scheduler= 1;
 --sleep 1
 --echo "Should have 2 locked processes"
-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;
 select release_lock('ee_16407_5');
 --sleep 2
 --echo "Should have 0 processes locked"
-select /*5*/ user, host, db, command, state, info from information_schema.processlist
where info is null or info not like '%processlist%' order by info;
+select /*5*/ 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 * from events_smode_test order by ev_name, a;
 --echo "And here we check one more time before we drop the events"
 select event_schema, event_name, sql_mode from information_schema.events order by
event_schema, event_name;