bzr commit into mysql-5.5 branch (horst.hunger:3396)

[Horst.Hunger]

#At file:///home/horst/bzr/mysql-5.5/ based on revid:marko.makela@stripped

 3396 Horst.Hunger	2011-05-24
      Merge of this test from trunk to 5.5 to have a successful weekly test on Windows.

    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	2010-11-15 15:17:38 +0000
+++ b/mysql-test/r/variables-big.result	2011-05-24 09:16:34 +0000
@@ -1,3 +1,4 @@
+SET @def_var= @@session.transaction_prealloc_size;
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
@@ -18,3 +19,4 @@ SET SESSION transaction_prealloc_size=10
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
+SET @@session.transaction_prealloc_size= @def_var;

=== modified file 'mysql-test/t/variables-big.test'
--- a/mysql-test/t/variables-big.test	2010-11-15 15:17:38 +0000
+++ b/mysql-test/t/variables-big.test	2011-05-24 09:16:34 +0000
@@ -34,6 +34,7 @@
 # There is a significant probablitity that this tests fails with testcase
 # timeout if the testing box is not powerful enough.
 #
+SET @def_var= @@session.transaction_prealloc_size;
 
 --disable_warnings
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
@@ -53,3 +54,5 @@ SET SESSION transaction_prealloc_size=10
 SHOW PROCESSLIST;
 --enable_warnings
 
+SET @@session.transaction_prealloc_size= @def_var;
+


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