diff options
| author | monty@butch. <> | 2002-11-07 12:49:01 +0200 |
|---|---|---|
| committer | monty@butch. <> | 2002-11-07 12:49:01 +0200 |
| commit | 890b39bb68eb90f1dc6ec13c8b8e1b06f3def116 (patch) | |
| tree | 735a853cc51cb8bebe0ea3e7c79b1a381088f96d /innobase | |
| parent | db6cbba239f9f17abaf1ab6c6055c45355f83fde (diff) | |
| parent | a2bdf9265f3a0874f8d58bec690da4af07bca4cb (diff) | |
| download | mariadb-git-890b39bb68eb90f1dc6ec13c8b8e1b06f3def116.tar.gz | |
merge
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/ut0ut.h | 1 | ||||
| -rw-r--r-- | innobase/log/log0log.c | 4 | ||||
| -rw-r--r-- | innobase/rem/rem0cmp.c | 2 | ||||
| -rw-r--r-- | innobase/trx/trx0sys.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/innobase/include/ut0ut.h b/innobase/include/ut0ut.h index 8ec23b23dcd..d4697c47266 100644 --- a/innobase/include/ut0ut.h +++ b/innobase/include/ut0ut.h @@ -10,6 +10,7 @@ Created 1/20/1994 Heikki Tuuri #define ut0ut_h #include "univ.i" +#include <string.h> #include <time.h> #ifndef MYSQL_SERVER #include <ctype.h> 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; diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c index c50516dfc8b..e9740d7ea78 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -353,7 +353,7 @@ cmp_data_data_slow( data2++; } - return(0); + return(0); /* Not reached */ } /***************************************************************** diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index 33c962772e8..19cf52c8676 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -474,7 +474,7 @@ trx_sys_update_mysql_binlog_offset( mlog_write_string(sys_header + field + TRX_SYS_MYSQL_LOG_NAME, - file_name, 1 + ut_strlen(file_name), mtr); + (byte*) file_name, 1 + ut_strlen(file_name), mtr); } if (mach_read_from_4(sys_header + field |