bzr push into mysql-5.5 branch (horst.hunger:3395 to 3396)

[Horst.Hunger]

 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
 3395 Marko Mäkelä	2011-05-24
      Backport an InnoDB Bug #58815 (Bug #11765812) work-around from mysql-trunk:
      
      ------------------------------------------------------------
      revno 2876.244.305
      revision id [e-mail]-20110413082211-e6ouhjz5rmqxcqap
      parent  marko.makela@stripped
      committer  Marko Mäkelä <marko.makela@stripped>
      branch nick 5.6-innodb
      timestamp Wed 2011-04-13 11:22:11 +0300
      message:
        Suppress the Bug #58815 (Bug #11765812) assertion failure.
      
        buf_page_get_gen(): Introduce BUF_GET_POSSIBLY_FREED for suppressing the
        check that the file page must not have been freed.
      
        btr_estimate_n_rows_in_range_on_level(): Pass BUF_GET_POSSIBLY_FREED and
        explain in the comments why this is needed and why it should be mostly
        harmless to ignore the problem. If InnoDB had always initialized all
        unused fields in data files, no problem would exist.
      
        This change does not fix the bug, it just "shoots the messenger".
      
        rb:647 approved by Jimmy Yang

    modified:
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/include/buf0buf.h
=== 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]