bzr commit into mysql-6.0-bugteam branch (dlenev:3103) Bug#40702

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.0-bugteam/ based on revid:staale.smedseng@stripped

 3103 Dmitry Lenev	2009-03-04 [merge]
      Merged fix for bug #40702 "skip_name_resolve fails
      sporadically on pushbuild" into 6.0.

    modified:
      mysql-test/r/skip_name_resolve.result
      mysql-test/t/skip_name_resolve.test
=== modified file 'mysql-test/r/skip_name_resolve.result'
--- a/mysql-test/r/skip_name_resolve.result	2006-07-04 16:44:35 +0000
+++ b/mysql-test/r/skip_name_resolve.result	2009-03-04 12:33:56 +0000
@@ -9,6 +9,3 @@ select user();
 user()
 #
 show processlist;
-Id	User	Host	db	Command	Time	State	Info
-<id>	root	<host>	test	<command>	<time>	<state>	<info>
-<id>	root	<host>	test	<command>	<time>	<state>	<info>

=== modified file 'mysql-test/t/skip_name_resolve.test'
--- a/mysql-test/t/skip_name_resolve.test	2005-12-18 17:11:19 +0000
+++ b/mysql-test/t/skip_name_resolve.test	2009-03-04 12:33:56 +0000
@@ -15,6 +15,9 @@ DROP USER mysqltest_1@'127.0.0.1/255.255
 connect (con1, 127.0.0.1, root, , test, $MASTER_MYPORT, );
 --replace_column 1 #
 select user();
---replace_column 1 <id> 3 <host> 5 <command> 6 <time> 7 <state> 8 <info>
+# We are only interested in the fact that statement below doesn't
+# crash server.
+--disable_result_log
 show processlist;
+--enable_result_log
 connection default;


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