bzr commit into mysql-5.1 branch (dlenev:2757) Bug#40702

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-5.1-bg40702-2/ based on revid:build@stripped

 2757 Dmitry Lenev	2009-03-03
      Fix for bug #40702 "skip_name_resolve fails sporadically on
      pushbuild".
      
      Under new MTR the server is not restarted for every test, so
      threads started in the previous test case can show up in the
      results of SHOW PROCESSLIST statement in this test, causing a
      test failure.
      
      Since we are not really interested in results of SHOW PROCESSLIST
      in this test but rather in fact that server doesn't crash when
      executing this statement this fix simply disables output of this
      statement.
     @ mysql-test/r/skip_name_resolve.result
        Disable SHOW PROCESSLIST output to make test immune to threads
        started in previous test cases.
     @ mysql-test/t/skip_name_resolve.test
        Disable SHOW PROCESSLIST output to make test immune to threads
        started in previous test cases.

    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-03 09:54:02 +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-03 09:54:02 +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]