bzr push into mysql-5.1-innodb branch (marko.makela:3419 to 3420)

[marko.makela]

 3420 Marko Mäkelä	2010-04-26
      recv_sys_init(): Skip the red-black tree in Hot Backup.

    modified:
      storage/innodb_plugin/log/log0recv.c
 3419 Marko Mäkeldded:
      mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
      mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
=== modified file 'storage/innodb_plugin/log/log0recv.c'
--- a/storage/innodb_plugin/log/log0recv.c	2010-03-23 16:20:36 +0000
+++ b/storage/innodb_plugin/log/log0recv.c	2010-04-26 11:26:09 +0000
@@ -300,11 +300,11 @@ recv_sys_init(
 	flush_list during recovery process.
 	As this initialization is done while holding the buffer pool
 	mutex we perform it before acquiring recv_sys->mutex. */
+#ifndef UNIV_HOTBACKUP
 	buf_flush_init_flush_rbt();
 
 	mutex_enter(&(recv_sys->mutex));
 
-#ifndef UNIV_HOTBACKUP
 	recv_sys->heap = mem_heap_create_in_buffer(256);
 #else /* !UNIV_HOTBACKUP */
 	recv_sys->heap = mem_heap_create(256);

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