branches/zip: Minor changes for Hot Backup to build correctly. (The

code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.

include/mtr0log.h

@@ -168,7 +168,7 @@ mlog_write_initial_log_record_fast(
 	mtr_t*		mtr);	/*!< in: mtr */
 #else /* !UNIV_HOTBACKUP */
 # define mlog_write_initial_log_record(ptr,type,mtr) ((void) 0)
-# define mlog_write_initial_log_record_fast(ptr,type,log_ptr,mtr) ((void) 0)
+# define mlog_write_initial_log_record_fast(ptr,type,log_ptr,mtr) ((byte *) 0)
 #endif /* !UNIV_HOTBACKUP */
 /********************************************************//**
 Parses an initial log record written by mlog_write_initial_log_record.

include/mtr0log.ic

@@ -23,7 +23,6 @@ Mini-transaction logging routines
 Created 12/7/1995 Heikki Tuuri
 *******************************************************/
 
-#ifndef UNIV_HOTBACKUP
 #include "mach0data.h"
 #include "ut0lst.h"
 #include "buf0buf.h"
@@ -73,6 +72,7 @@ mlog_close(
 	dyn_array_close(mlog, ptr);
 }
 
+#ifndef UNIV_HOTBACKUP
 /********************************************************//**
 Catenates 1 - 4 bytes to the mtr log. The value is not compressed. */
 UNIV_INLINE

mtr/mtr0log.c

@@ -239,7 +239,6 @@ mlog_parse_nbytes(
 	return(ptr);
 }
 
-#ifndef UNIV_HOTBACKUP
 /********************************************************//**
 Writes 1 - 4 bytes to a file page buffered in the buffer pool.
 Writes the corresponding log record to the mini-transaction log. */
@@ -322,6 +321,7 @@ mlog_write_dulint(
 	mlog_close(mtr, log_ptr);
 }
 
+#ifndef UNIV_HOTBACKUP
 /********************************************************//**
 Writes a string to a file page buffered in the buffer pool. Writes the
 corresponding log record to the mini-transaction log. */