From: Philip Stoev
Date: June 9 2009 10:32am
Subject: bzr commit into mysql-5.1-bugteam branch (pstoev:2875) Bug#29971
List-Archive: http://lists.mysql.com/commits/76157
X-Bug: 29971
Message-Id: <200906091032.n59AWi6s005797@localhost.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3319713616788050739=="

--===============3319713616788050739==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///build/bzr/5.1-bugteam/ based on revid:pstoev@stripped

 2875 Philip Stoev	2009-06-09
      Bug #29971 status.test fails
      
      This test uses SHOW STATUS and the like, which may be unstable in the face
      of logging to table, since the CSV handler is actively executing operations
      and thus incrementing the counters.
      
      Fixed by disabling logging to table for the duration of the test and restoring
      it afterwards. This causes various counters to properly start counting from zero
      and never advance due to CSV operations.

    modified:
      mysql-test/r/status.result
      mysql-test/t/status.test
=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2009-02-05 16:48:47 +0000
+++ b/mysql-test/r/status.result	2009-06-09 10:31:41 +0000
@@ -1,13 +1,15 @@
 set @old_concurrent_insert= @@global.concurrent_insert;
 set @@global.concurrent_insert= 0;
+SET @old_log_output = @@global.log_output;
+SET GLOBAL LOG_OUTPUT = 'FILE';
 flush status;
 show status like 'Table_lock%';
 Variable_name	Value
-Table_locks_immediate	1
+Table_locks_immediate	0
 Table_locks_waited	0
 select * from information_schema.session_status where variable_name like 'Table_lock%';
 VARIABLE_NAME	VARIABLE_VALUE
-TABLE_LOCKS_IMMEDIATE	2
+TABLE_LOCKS_IMMEDIATE	0
 TABLE_LOCKS_WAITED	0
 # Switched to connection: con1
 set sql_log_bin=0;
@@ -154,7 +156,7 @@ Variable_name	Value
 Com_show_status	3
 show status like 'hand%write%';
 Variable_name	Value
-Handler_write	5
+Handler_write	0
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
@@ -162,7 +164,7 @@ Created_tmp_files	0
 Created_tmp_tables	0
 show status like 'hand%write%';
 Variable_name	Value
-Handler_write	7
+Handler_write	0
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
@@ -237,3 +239,4 @@ SELECT 9;
 DROP PROCEDURE p1;
 DROP FUNCTION f1;
 set @@global.concurrent_insert= @old_concurrent_insert;
+SET GLOBAL log_output = @old_log_output;

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2009-03-06 14:56:17 +0000
+++ b/mysql-test/t/status.test	2009-06-09 10:31:41 +0000
@@ -12,6 +12,12 @@
 set @old_concurrent_insert= @@global.concurrent_insert;
 set @@global.concurrent_insert= 0;
 
+# Disable logging to table, since this will also cause table locking and unlocking, which will
+# show up in SHOW STATUS and may cause sporadic failures
+
+SET @old_log_output = @@global.log_output;
+SET GLOBAL LOG_OUTPUT = 'FILE';
+
 # PS causes different statistics
 --disable_ps_protocol
 
@@ -350,6 +356,7 @@ DROP FUNCTION f1;
 # Restore global concurrent_insert value. Keep in the end of the test file.
 --connection default
 set @@global.concurrent_insert= @old_concurrent_insert;
+SET GLOBAL log_output = @old_log_output;
 
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc


--===============3319713616788050739==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/pstoev@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pstoev@stripped
# target_branch: file:///build/bzr/5.1-bugteam/
# testament_sha1: 7016cd032dc96ee7a825dbd376c9187706c78728
# timestamp: 2009-06-09 13:32:43 +0300
# base_revision_id: pstoev@stripped
# 
# Begin bundle
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


--===============3319713616788050739==--