Merge from mysql-5.1-innodb:

  ------------------------------------------------------------
  revno: 3420
  revision-id: marko.makela@oracle.com-20100426112609-f7lgl8crw4x4sfkk
  parent: marko.makela@oracle.com-20100426110856-14tc8re1f5kp5j3g
  committer: Marko M?kel? <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Mon 2010-04-26 14:26:09 +0300
  message:
    recv_sys_init(): Skip the red-black tree in Hot Backup.
  modified:
    storage/innodb_plugin/log/log0recv.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flog%2Flog0recv.c
  ------------------------------------------------------------

storage/innobase/log/log0recv.c

@@ -309,12 +309,12 @@ 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();
 #endif /* !UNIV_HOTBACKUP */
 
 	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);