bzr commit into mysql-5.5-bugteam branch (bar:3136) Bug#57306

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-5.5-bugteam/ based on revid:jon.hauglid@strippedw5ei7

 3136 Alexander Barkov	2010-11-19
      Bug#57306 SHOW PROCESSLIST does not display string literals well.
      
      A post-patch fixing test failures on Windows.
      
      Host name in "SHOW PROCESSLIST" is displayed with port number
      for some reasons.

    modified:
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2010-11-18 14:08:32 +0000
+++ b/mysql-test/r/show_check.result	2010-11-19 05:33:34 +0000
@@ -1525,13 +1525,13 @@ SET NAMES latin1;
 SELECT GET_LOCK('t',1000) AS 'óóóó';;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-###	root	localhost	test	Query	###	###	SHOW PROCESSLIST
-###	root	localhost	test	Query	###	###	SELECT GET_LOCK('t',1000) AS 'óóóó'
+###	root	###	test	Query	###	###	SHOW PROCESSLIST
+###	root	###	test	Query	###	###	SELECT GET_LOCK('t',1000) AS 'óóóó'
 SET NAMES utf8;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-###	root	localhost	test	Query	###	###	SHOW PROCESSLIST
-###	root	localhost	test	Query	###	###	SELECT GET_LOCK('t',1000) AS 'óóóó'
+###	root	###	test	Query	###	###	SHOW PROCESSLIST
+###	root	###	test	Query	###	###	SELECT GET_LOCK('t',1000) AS 'óóóó'
 SELECT RELEASE_LOCK('t');
 RELEASE_LOCK('t')
 1

=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test	2010-11-18 14:08:32 +0000
+++ b/mysql-test/t/show_check.test	2010-11-19 05:33:34 +0000
@@ -1343,10 +1343,10 @@ SET NAMES latin1;
 let $wait_timeout= 10;
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
 --source include/wait_condition.inc
---replace_column 1 ### 6 ### 7 ###
+--replace_column 1 ### 3 ### 6 ### 7 ###
 SHOW PROCESSLIST;
 SET NAMES utf8;
---replace_column 1 ### 6 ### 7 ###
+--replace_column 1 ### 3 ### 6 ### 7 ###
 SHOW PROCESSLIST;
 SELECT RELEASE_LOCK('t');
 --connection con1

Attachment: [text/bzr-bundle] bzr/[e-mail]