update test results

2 files changed, 22 insertions, 22 deletions

diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
index 52ed7a4d0ac..66d3aa4c10b 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
@@ -41,11 +41,11 @@ ID	root	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	root	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	root	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -113,10 +113,10 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO, TIME_MS, STAGE, MAX_STAGE, PROGRESS FROM processlist  ORDER BY id	TIME_MS	0	0	0.000
 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;
@@ -176,7 +176,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -191,7 +191,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
@@ -215,7 +215,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID		HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID		HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID		HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	root	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -239,7 +239,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
@@ -257,7 +257,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID		HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID		HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID		HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -279,7 +279,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -305,7 +305,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -359,7 +359,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -388,7 +388,7 @@ ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -417,7 +417,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
@@ -453,7 +453,7 @@ ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS
 ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist	TIME_MS
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	Filling schema table	SELECT * FROM information_schema.processlist	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
 ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		NULL	TIME_MS	0	0	0.000
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
index c3112bc573c..9ea0aa6d021 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
@@ -30,7 +30,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	root	<HOST_NAME>	test	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	test	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	test	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	<TIME_MS>
@@ -42,7 +42,7 @@ Expect exact one connection with this id
 SELECT COUNT(*)  = 1 AS "Expect 1"
 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = @default_id
 AND USER = 'root' AND DB = 'test' AND Command IN('Query','Execute')
-AND State = 'executing';
+AND State = 'Filling schema table';
 Expect 1
 1
 USE information_schema;
@@ -78,7 +78,7 @@ Has TIME a reasonable value?
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -111,7 +111,7 @@ Expect 1
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -128,7 +128,7 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
-<ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	test_user	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
@@ -156,7 +156,7 @@ SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	User sleep	SELECT sleep(10), 17	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info	Progress
 <ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST	0.000
@@ -203,7 +203,7 @@ SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO	TIME_MS	STAGE	MAX_STAGE	PROGRESS
 <ID>	test_user	<HOST_NAME>	information_schema	Query	<TIME>	Waiting for table metadata lock	SELECT COUNT(*) FROM test.t1	<TIME_MS>	0	0	0.000
 <ID>	test_user	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL	<TIME_MS>	0	0	0.000
-<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
+<ID>	root	<HOST_NAME>	information_schema	Execute	<TIME>	Filling schema table	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST	<TIME_MS>	0	0	0.000
 UNLOCK TABLES;
 # ----- switch to connection con2 (user = test_user) -----