From: Marc Alff
Date: February 16 2011 10:24am
Subject: bzr push into mysql-trunk branch (marc.alff:3209 to 3210) WL#2515 WL#4813
List-Archive: http://lists.mysql.com/commits/131400
Message-Id: <201102161025.p1GAPRIi006427@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3210 Marc Alff	2011-02-16
      WL#4813 PERFORMANCE_SCHEMA Instrumenting Stages
      WL#2515 PERFORMANCE_SCHEMA statements
      
      Tests cleanup.

    modified:
      mysql-test/r/sp-threads.result
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
 3209 Marc Alff	2011-02-15
      WL#4813 PERFORMANCE_SCHEMA Instrumenting Stages
      WL#2515 PERFORMANCE_SCHEMA statements
      
      Implementation (continued)

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      sql/filesort.cc
      sql/item_func.cc
      sql/lock.cc
      sql/log.cc
      sql/log_event.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_master.cc
      sql/rpl_slave.cc
      sql/sql_base.cc
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_cursor.cc
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_parse.cc
      sql/sql_partition_admin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_table.cc
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_view.cc
=== modified file 'mysql-test/r/sp-threads.result'
--- a/mysql-test/r/sp-threads.result	2010-08-06 11:29:37 +0000
+++ b/mysql-test/r/sp-threads.result	2011-02-16 10:22:49 +0000
@@ -36,7 +36,7 @@ show processlist;
 Id	User	Host	db	Command	Time	State	Info
 #	root	localhost	test	Sleep	#		NULL
 #	root	localhost	test	Query	#	Waiting for table metadata lock	update t1, t2 set val= 1 where id1=id2
-#	root	localhost	test	Query	#	NULL	show processlist
+#	root	localhost	test	Query	#	init	show processlist
 #	root	localhost	test	Sleep	#		NULL
 unlock tables;
 drop procedure bug9486;

=== modified file 'mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result'
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2010-08-09 08:32:50 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2011-02-16 10:22:49 +0000
@@ -33,7 +33,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -104,7 +104,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
@@ -169,7 +169,7 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -184,7 +184,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -208,7 +208,7 @@ Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID		HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -232,7 +232,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -272,7 +272,7 @@ Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -298,7 +298,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -352,7 +352,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -381,7 +381,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -410,7 +410,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
@@ -446,7 +446,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist

=== modified file 'mysql-test/suite/funcs_1/r/processlist_priv_ps.result'
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2010-08-09 08:32:50 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2011-02-16 10:22:49 +0000
@@ -33,7 +33,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
@@ -104,7 +104,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
@@ -169,7 +169,7 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -184,7 +184,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -208,7 +208,7 @@ Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID		HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID		HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -232,7 +232,7 @@ SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -272,7 +272,7 @@ Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -298,7 +298,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -352,7 +352,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -381,7 +381,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -410,7 +410,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
@@ -446,7 +446,7 @@ ID	ddicttestuser1	HOST_NAME	information_
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	init	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist

=== modified file 'mysql-test/suite/funcs_1/r/processlist_val_no_prot.result'
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2010-08-06 11:29:37 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2011-02-16 10:22:49 +0000
@@ -29,7 +29,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -77,7 +77,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -110,7 +110,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -129,7 +129,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 # ----- switch to connection default (user = root) -----
 
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -155,7 +155,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17
 SELECT STATE, TIME, INFO INTO @state, @time, @info

=== modified file 'mysql-test/suite/funcs_1/r/processlist_val_ps.result'
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2010-08-06 11:29:37 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2011-02-16 10:22:49 +0000
@@ -29,7 +29,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	test	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	test	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	test	Query	<TIME>	init	SHOW FULL PROCESSLIST
 SET @default_id = CONNECTION_ID();
 SELECT COUNT(*)  = 1 AS "Expect exact one connection with this id"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id;
@@ -77,7 +77,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SELECT ID,TIME INTO @test_user_con1_id,@time FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE COMMAND = 'Sleep' AND USER = 'test_user';
@@ -110,7 +110,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 # Ensure that the user test_user sees all connections with his username.
 #----------------------------------------------------------------------------
 
@@ -129,7 +129,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
-<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 # ----- switch to connection default (user = root) -----
 
 SELECT ID INTO @test_user_con2_id FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -155,7 +155,7 @@ ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	init	SHOW FULL PROCESSLIST
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17
 SELECT STATE, TIME, INFO INTO @state, @time, @info

No bundle (reason: useless for push emails).