List:Commits« Previous MessageNext Message »
From:pcrews Date:April 27 2008 6:13pm
Subject:bk commit into 6.0 tree (pcrews:1.2631) BUG#36032
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of pcrews.  When pcrews 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, 2008-04-27 14:13:00-04:00, pcrews@stripped +4 -0
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Changes to .result files to account for differences between 6.0 and 5.1

  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result@stripped, 2008-04-27 14:12:58-04:00, pcrews@stripped +84 -84
    Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
    
    re-recorded results file -- apparent difference between 5.1 and 6.0 results.

  mysql-test/suite/funcs_1/r/processlist_priv_ps.result@stripped, 2008-04-27 14:12:58-04:00, pcrews@stripped +84 -84
    Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
    
    re-recorded results file -- apparent difference between 5.1 and 6.0 results.

  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result@stripped, 2008-04-27 14:12:58-04:00, pcrews@stripped +6 -4
    Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
    
    re-recorded results file -- apparent difference between 5.1 and 6.0 results.

  mysql-test/suite/funcs_1/r/processlist_val_ps.result@stripped, 2008-04-27 14:12:58-04:00, pcrews@stripped +6 -4
    Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
    
    re-recorded results file -- apparent difference between 5.1 and 6.0 results.

diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2008-04-26 21:01:25 -04:00
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2008-04-27 14:12:58 -04:00
@@ -36,15 +36,15 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -183,14 +183,14 @@ 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	root	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 5 Grant PROCESS privilege to anonymous user.
 connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
 GRANT PROCESS ON *.* TO ''@'localhost'
 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	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID		HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 6 Revoke PROCESS privilege from ddicttestuser1
 connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -255,7 +255,7 @@ GRANT USAGE ON *.* TO ''@'localhost'
 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
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
 connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 9 Revoke SUPER privilege from user ddicttestuser1
 connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 10 Grant SUPER privilege with grant option to user ddicttestuser1.
 connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		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	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
 connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME	NULL	NULL
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
 connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 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	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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 12 Revoke the SELECT privilege from user ddicttestuser1
 connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	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	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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2008-04-26 21:01:33 -04:00
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result	2008-04-27 14:12:58 -04:00
@@ -36,15 +36,15 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -183,14 +183,14 @@ 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	root	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 5 Grant PROCESS privilege to anonymous user.
 connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
 GRANT PROCESS ON *.* TO ''@'localhost'
 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	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID		HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 6 Revoke PROCESS privilege from ddicttestuser1
 connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -255,7 +255,7 @@ GRANT USAGE ON *.* TO ''@'localhost'
 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
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
 connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 9 Revoke SUPER privilege from user ddicttestuser1
 connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 10 Grant SUPER privilege with grant option to user ddicttestuser1.
 connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	Sleep	TIME		NULL
-ID		HOST_NAME	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
-ID		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	root	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID		HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	root	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
 connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	Sleep	TIME	NULL	NULL
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
 connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 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	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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	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	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 12 Revoke the SELECT privilege from user ddicttestuser1
 connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 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	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	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	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	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
-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	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	Sleep	TIME		NULL
-ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME	NULL	NULL
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2008-04-26 21:01:36 -04:00
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2008-04-27 14:12:58 -04:00
@@ -67,10 +67,10 @@ Id	User	Host	db	Command	Time	State	Info
 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
-<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>	NULL	NULL
 SHOW FULL 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	NULL
 <ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- switch to connection default (user = root) -----
@@ -133,14 +133,16 @@ SELECT COUNT(*) FROM test.t1;
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
+Timeout in wait_condition.inc for SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE INFO IS NOT NULL AND STATE = 'Locked'
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Table lock	SELECT COUNT(*) FROM test.t1
 <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>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Table lock	SELECT COUNT(*) FROM test.t1
 UNLOCK TABLES;
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2008-04-26 21:01:43 -04:00
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result	2008-04-27 14:12:58 -04:00
@@ -67,10 +67,10 @@ Id	User	Host	db	Command	Time	State	Info
 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
-<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>	NULL	NULL
 SHOW FULL 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	NULL
 <ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- switch to connection default (user = root) -----
@@ -133,14 +133,16 @@ SELECT COUNT(*) FROM test.t1;
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
+Timeout in wait_condition.inc for SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE INFO IS NOT NULL AND STATE = 'Locked'
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Table lock	SELECT COUNT(*) FROM test.t1
 <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>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Table lock	SELECT COUNT(*) FROM test.t1
 UNLOCK TABLES;
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
Thread
bk commit into 6.0 tree (pcrews:1.2631) BUG#36032pcrews27 Apr