summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-11-10 09:39:50 +0200
committerunknown <monty@hundin.mysql.fi>2002-11-10 09:39:50 +0200
commit1b6548d54d6d649c068a73c8550e75ddb26bfd00 (patch)
tree0a2e633454bfdde1397ab7c103dfcea094b82d0c /innobase
parentdce4b2c9589e73be9b7a0b2c81ae06ee47eb09c2 (diff)
parentc88db89d6212a0ce560654d878d6dc68a14fc111 (diff)
downloadmariadb-git-1b6548d54d6d649c068a73c8550e75ddb26bfd00.tar.gz
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'innobase')
-rw-r--r--innobase/log/log0log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index c798a08e2de..f9b785ccbd5 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -1654,8 +1654,8 @@ log_reset_first_header_and_checkpoint(
lsn = ut_dulint_add(start, LOG_BLOCK_HDR_SIZE);
/* Write the label of ibbackup --restore */
- sprintf(hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, "ibbackup ");
- ut_sprintf_timestamp(hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP
+ sprintf((char*) hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, "ibbackup ");
+ ut_sprintf_timestamp((char*) hdr_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP
+ strlen("ibbackup "));
buf = hdr_buf + LOG_CHECKPOINT_1;