Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj

mysql-test/r/events.result

@@ -309,7 +309,7 @@ select definer, name, db from mysql.event;
 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 @@ get_lock("test_lock2", 20)
 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 @@ get_lock("test_lock2_1", 20)
 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)

mysql-test/r/events_bugs.result

@@ -50,7 +50,7 @@ select get_lock('test_bug16407', 60);
 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 @@ select get_lock('ee_16407_2', 60);
 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 @@ root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60)
 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 @@ get_lock('ee_16407_5', 60)
 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 @@ select release_lock('ee_16407_5');
 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;

mysql-test/r/not_embedded_server.result

-prepare stmt1 from ' show full processlist ';
+prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' ';
 execute stmt1;
-Id	User	Host	db	Command	Time	State	Info
+ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
+number	root	localhost	test	Query	time	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!='Daemon'
 number	event_scheduler	localhost	NULL	Connect	time	Suspended	NULL
-number	root	localhost	test	Query	time	NULL	show full processlist
 deallocate prepare stmt1;

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;
 
 ####

mysql-test/t/events_bugs.test

@@ -80,7 +80,7 @@ end|
 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 @@ set sql_mode="ansi";
 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 @@ select get_lock('ee_16407_5', 60);
 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;

mysql-test/t/not_embedded_server.test

@@ -9,10 +9,15 @@
 # To not show other connections, this must be the first test and we must
 # have a server restart before this one
 #
+# We don't have any 4.1 tests as we use I_S to query the PROCESSLIST to
+# exclude system threads that may/may not be active in the server
+# (namely the ndb injector thread)
+#
+# End of 4.1 tests
 
-prepare stmt1 from ' show full processlist ';
+prepare stmt1 from ' SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND!=\'Daemon\' ';
 --replace_column 1 number 6 time 3 localhost
 execute stmt1;
 deallocate prepare stmt1;
 
-# End of 4.1 tests
+# End of 5.1 tests

sql/sql_show.cc

@@ -5545,7 +5545,7 @@ ST_FIELD_INFO processlist_fields_info[]=
   {"DB", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, "Db"},
   {"COMMAND", 16, MYSQL_TYPE_STRING, 0, 0, "Command"},
   {"TIME", 7, MYSQL_TYPE_LONG, 0, 0, "Time"},
-  {"STATE", 30, MYSQL_TYPE_STRING, 0, 1, "State"},
+  {"STATE", 64, MYSQL_TYPE_STRING, 0, 1, "State"},
   {"INFO", PROCESS_LIST_INFO_WIDTH, MYSQL_TYPE_STRING, 0, 1, "Info"},
   {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
 };