summaryrefslogtreecommitdiff
path: root/storage/innodb_plugin/mtr
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2009-07-30 17:42:56 +0500
committerSergey Vojtovich <svoj@sun.com>2009-07-30 17:42:56 +0500
commit46cc71600a2388d9c908749c02614a1db7cc1292 (patch)
tree4d4fd1ed09a36796ae4f3f23fc3daa5f4bf7947f /storage/innodb_plugin/mtr
parenta6f83e117266bab2275138813d511eee6f72a1bf (diff)
downloadmariadb-git-46cc71600a2388d9c908749c02614a1db7cc1292.tar.gz
Update to innoplug-1.0.4.
Diffstat (limited to 'storage/innodb_plugin/mtr')
-rw-r--r--storage/innodb_plugin/mtr/mtr0log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innodb_plugin/mtr/mtr0log.c b/storage/innodb_plugin/mtr/mtr0log.c
index a2f39434a90..3f3dab36b76 100644
--- a/storage/innodb_plugin/mtr/mtr0log.c
+++ b/storage/innodb_plugin/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. */
@@ -440,7 +440,7 @@ byte*
mlog_open_and_write_index(
/*======================*/
mtr_t* mtr, /*!< in: mtr */
- byte* rec, /*!< in: index record or page */
+ const byte* rec, /*!< in: index record or page */
dict_index_t* index, /*!< in: record descriptor */
byte type, /*!< in: log item type */
ulint size) /*!< in: requested buffer size in bytes