bzr commit into mysql-5.0-bugteam branch (patrick.crews:2776) Bug#43711

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/variables-big/mysql-5.0-bugteam/ based on revid:joro@stripped

 2776 Patrick Crews	2009-03-17
      Bug#43711: Test main.variables-big fails due to non-deterministic test query
      
      Used replace_column to remove the variable 'id' column from SHOW PROCESSLIST output.
      Also did some formatting cleanup 

    modified:
      mysql-test/r/variables-big.result
      mysql-test/t/variables-big.test
=== modified file 'mysql-test/r/variables-big.result'
--- a/mysql-test/r/variables-big.result	2007-12-21 19:30:23 +0000
+++ b/mysql-test/r/variables-big.result	2009-03-17 19:56:48 +0000
@@ -1,24 +1,24 @@
-set session transaction_prealloc_size=1024*1024*1024*1;
-show processlist;
+SET SESSION transaction_prealloc_size=1024*1024*1024*1;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*2;
-show processlist;
+<id>	root	localhost	test	Query	0	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*2;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	1	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*3;
-show processlist;
+<id>	root	localhost	test	Query	0	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*3;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*4;
+<id>	root	localhost	test	Query	0	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 Warnings:
 Warning	1292	Truncated incorrect transaction_prealloc_size value: '4294967296'
-show processlist;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+<id>	root	localhost	test	Query	0	NULL	SHOW PROCESSLIST
 set session transaction_prealloc_size=1024*1024*1024*5;
 Warnings:
 Warning	1292	Truncated incorrect transaction_prealloc_size value: '5368709120'
-show processlist;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+<id>	root	localhost	test	Query	0	NULL	SHOW PROCESSLIST

=== modified file 'mysql-test/t/variables-big.test'
--- a/mysql-test/t/variables-big.test	2007-04-12 22:03:26 +0000
+++ b/mysql-test/t/variables-big.test	2009-03-17 19:56:48 +0000
@@ -5,16 +5,23 @@
 --source include/big_test.inc
 
 #
-# Bug #27322  	failure to allocate transaction_prealloc_size causes crash
+# Bug#27322 failure to allocate transaction_prealloc_size causes crash
 #
+# Here, we tinker with the size of transaction_prealloc_size and ensure the server is still up.
 
-set session transaction_prealloc_size=1024*1024*1024*1;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*2;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*3;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*4;
-show processlist;
+SET SESSION transaction_prealloc_size=1024*1024*1024*1;
+--replace_column 1, <id>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*2;
+--replace_column 1, <id>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*3;
+--replace_column 1, <id>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*4;
+--replace_column 1, <id>
+SHOW PROCESSLIST;
 set session transaction_prealloc_size=1024*1024*1024*5;
-show processlist;
+--replace_column 1, <id>
+SHOW PROCESSLIST;
+


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