diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 9f84b49de3a..55fd70b80b7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2420,13 +2420,7 @@ sub setup_vardir() {
   {
     # on windows, copy all files from std_data into var/std_data_ln
     mkpath("$opt_vardir/std_data_ln");
-    opendir(DIR, "$glob_mysql_test_dir/std_data")
-      or mtr_error("Can't find the std_data directory: $!");
-    for(readdir(DIR)) {
-      next if -d "$glob_mysql_test_dir/std_data/$_";
-      copy("$glob_mysql_test_dir/std_data/$_", "$opt_vardir/std_data_ln/$_");
-    }
-    closedir(DIR);
+    mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
   }
 
   # Remove old log files
diff --git a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
index 24df7ef8948..66c43c750fd 100644
--- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
+++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
@@ -53,8 +53,9 @@
 #                    WL#3982 Test information_schema.processlist       #
 #                                                                      #
 # Last update:                                                         #
-# 2007-08-14 mleich  Corrections                                       #
-#                                                                      #
+# 2008-04-14 pcrews  replace HOST to account for Windows' use of       #
+#                    localhost (host:<port> causing diffs on Windows   #
+#                    test runs                                         #
 ########################################################################
 
 # The following variables are used in "datadict_priv.inc" and here.
@@ -112,11 +113,11 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo ####################################################################################
 connection default;
 eval SHOW CREATE TABLE $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SHOW $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
 --real_sleep 0.3
@@ -128,11 +129,11 @@ connection con100;
 --echo   SHOW/SELECT shows only the processes (1) of the user.
 --echo ####################################################################################
 eval SHOW CREATE TABLE $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SHOW $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
 --real_sleep 0.3
@@ -154,9 +155,9 @@ GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
 --echo ####################################################################################
 connection con100;
 SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -166,9 +167,9 @@ SELECT * FROM information_schema.processlist;
 --echo ####################################################################################
 connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
 SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -188,9 +189,9 @@ GRANT PROCESS ON *.* TO ''@'localhost';
 --echo ####################################################################################
 connect (anonymous1,localhost,'',,information_schema);
 SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -210,9 +211,9 @@ connect (con102,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     ddicttestuser1 are visible.
 --echo ####################################################################################
 SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -235,10 +236,10 @@ SHOW GRANTS FOR ''@'localhost';
 if ($fixed_bug_30395)
 {
 # Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
 }
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -257,9 +258,9 @@ connect (con103,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     Only the processes of ddicttestuser1 user are visible.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -279,9 +280,9 @@ connect (con104,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     Only the processes of ddicttestuser1 are visible.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -326,9 +327,9 @@ connect (con200,localhost,ddicttestuser2,ddictpass,information_schema);
 --echo      ddicttestuser2 has now the PROCESS privilege and sees all connections
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -347,9 +348,9 @@ connect (con201,localhost,ddicttestuser2,ddictpass,information_schema);
 --echo      ddicttestuser2 has no more the PROCESS privilege and can only see own connects
 --echo ####################################################################################
 SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -370,9 +371,9 @@ connect (con107,localhost,ddicttestuser1,ddictpass,information_schema);
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 --error ER_ACCESS_DENIED_ERROR
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -394,9 +395,9 @@ connect (con108,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo      Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
index 69a32553f65..29fbd5f616d 100644
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
@@ -34,7 +34,11 @@
 #                   WL#3982 Test information_schema.processlist        #
 # 2008-01-05 HHunger Changed time test and long statement test.        #
 #                    It could happen that the long statement test      #
-#                    fail due to timing problems.                      #          #                                                                      #
+#                    fail due to timing problems.                      #
+# 2008-04-14 pcrews Changed --replace_columns to include host          #
+#                   this is due to failure occurring on Windows        #
+#                   Win results included port number as well causing   #
+#                   test failures                                      # 
 ########################################################################
 
 # Basic preparations
@@ -76,9 +80,9 @@ SHOW FULL PROCESSLIST;
 #
 # Expect to see now DB = 'information_schema'
 USE information_schema;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SHOW FULL PROCESSLIST;
 #
 # Expect to see now INFO = 'SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;'
@@ -139,9 +143,9 @@ WHERE USER = 'ddicttestuser1';
 --echo
 --echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 connection ddicttestuser1;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SHOW FULL PROCESSLIST;
 
 
@@ -156,9 +160,9 @@ connect (con2,localhost,ddicttestuser1,ddictpass,information_schema);
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
         WHERE COMMAND = 'Sleep';
 --source include/wait_condition.inc
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SHOW FULL PROCESSLIST;
 #
 --echo
@@ -285,9 +289,9 @@ let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
 #
 # Expect to see the state 'Locked' for the second connection because the SELECT
 # collides with the WRITE TABLE LOCK.
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
 SHOW FULL PROCESSLIST;
 UNLOCK TABLES;
 #
diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
index 23b4d65d0c9..e24dae61f17 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
@@ -35,16 +35,16 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	root	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 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;
@@ -105,13 +105,13 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	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	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 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;
@@ -170,10 +170,10 @@ 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	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID		localhost	information_schema	Sleep	TIME		NULL
+ID		HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID		HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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	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	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	HOST_NAME	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		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'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)
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 51bfeaa5db4..8ec9fad75e1 100644
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
@@ -35,16 +35,16 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Query	TIME	NULL	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
-ID	root	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 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;
@@ -105,13 +105,13 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	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	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 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;
@@ -170,10 +170,10 @@ 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	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID		localhost	information_schema	Sleep	TIME		NULL
+ID		HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID		HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+ID	ddicttestuser1	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+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	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	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID		localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	root	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		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	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	HOST_NAME	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser2	HOST_NAME	information_schema	Sleep	TIME		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'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 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	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	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
+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	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+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
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)
diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
index 467015012f9..152a6c8fe57 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
@@ -31,10 +31,10 @@ Id	User	Host	db	Command	Time	State	Info
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<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	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
 INFO
 SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- switch to connection default (user = root) -----
 ----- close connection con2 -----
@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	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	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<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
 UNLOCK TABLES;
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
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 8d7cfdd5203..f2252d6bd79 100644
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
@@ -31,10 +31,10 @@ Id	User	Host	db	Command	Time	State	Info
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<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	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	root	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
 INFO
 SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Sleep	<TIME>		NULL
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
 
 ----- switch to connection default (user = root) -----
 ----- close connection con2 -----
@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	<HOST_NAME>	information_schema	Query	<TIME>	Locked	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	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
+<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
 UNLOCK TABLES;
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
diff --git a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
index b953d858adb..587339e123e 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc
@@ -1,21 +1,21 @@
 ################################################################################
-# inc/partition_layout_check1.inc                                          #
+# inc/partition_layout_check1.inc                                              #
 #                                                                              #
 # Purpose:                                                                     #
 #   Store the SHOW CREATE TABLE output and the list of files belonging to      #
 #   this table + print this into the protocol                                  #
 #   This script is only usefule when sourced within the partitioning tests.    #
 #                                                                              #
-# Attention: The routine inc/partition_layout_check2.inc is very similar   #
+# Attention: The routine inc/partition_layout_check2.inc is very similar       #
 #            to this one. So if something has to be changed here it            #
 #            might be necessary to do it also there                            #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
-# Change Author:                                                               #
-# Change Date:                                                                 #
-# Change:                                                                      #
+# Change Author: pcrews                                                        #
+# Change Date: 2008-04-15                                                      #
+# Change: Added --replace_result to account for Windows' use of '\r'           #
 ################################################################################
 
 if ($no_debug)
@@ -31,32 +31,34 @@ DELETE FROM t0_definition;
 # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than
 #   the corresponding SELECT on the INFORMATION_SCHEMA
 # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1;
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true
+
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
+let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
+--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2''
-)');
-let $file_list= `SELECT @aux`;
+eval SET @aux = load_file('$ls_file');
 }
 if (!$do_file_tests)
 {
-let $file_list= '--- not determined ---';
+SET @aux = '--- not determined ---';
 }
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'old',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
-     file_list      = $file_list;
+     create_command = load_file('$show_file'),
+     file_list      = @aux;
 
 # Print the create table statement into the protocol
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR '\r' ''
 SELECT create_command FROM t0_definition WHERE state = 'old';
 if ($do_file_tests)
 {
@@ -64,7 +66,7 @@ if ($do_file_tests)
    if ($ls)
    {
       # Print the list of files into the protocol
-      eval SELECT REPLACE(file_list,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR')
+      eval SELECT REPLACE(@aux,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR')
                   AS "unified filelist"
            FROM t0_definition WHERE state = 'old';
    }
diff --git a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
index 716baa7d042..2f42fb90c14 100644
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc
@@ -7,7 +7,7 @@
 #   since the call of inc/partition_layout_check1.inc                          #
 #   This script is only usefule when sourced within the partitioning tests.    #
 #                                                                              #
-# Attention: The routine inc/partition_layout_check1.inc is very similar   #
+# Attention: The routine inc/partition_layout_check1.inc is very similar       #
 #            to this one. So if something has to be changed here it            #
 #            might be necessary to do it also there                            #
 #                                                                              #
@@ -27,28 +27,31 @@ if ($no_debug)
 DELETE FROM t0_definition WHERE state = 'new';
 
 # Dump the current definition of the table t1 to tmp1
---exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true
+let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1;
+--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true
+
 if ($do_file_tests)
 {
 # List the files belonging to the table t1
---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
+let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
+--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
 if ($with_directories)
 {
---exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
---exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
+--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
 }
-eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')');
-let $file_list= `SELECT @aux`;
+eval SET @aux = load_file('$ls_file');
 }
 if (!$do_file_tests)
 {
-let $file_list= '--- not determined ---';
+SET @aux = '--- not determined ---';
 }
 
 # Insert the current definition of the table t1 into t0_definition
 eval INSERT INTO t0_definition SET state = 'new',
-     create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'),
-     file_list      = $file_list;
+     create_command = load_file('$show_file'),
+     file_list      = @aux;
 
 # Print the old and new table layout, if they differ
 SELECT COUNT(*) <> 1 INTO @aux
diff --git a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
index 65ca09846b6..c97bdbec83e 100644
--- a/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
@@ -16813,7 +16813,6 @@ $MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
 $MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
 $MYSQLTEST_VARDIR/master-data/test/t1.frm
 $MYSQLTEST_VARDIR/master-data/test/t1.par
-ls: $MYSQLTEST_VARDIR/mysql-test-data-dir/t1*: No such file or directory
 $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
 $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI