summaryrefslogtreecommitdiff
path: root/innobase/trx
diff options
context:
space:
mode:
authormonty@butch. <>2002-11-07 12:49:01 +0200
committermonty@butch. <>2002-11-07 12:49:01 +0200
commit890b39bb68eb90f1dc6ec13c8b8e1b06f3def116 (patch)
tree735a853cc51cb8bebe0ea3e7c79b1a381088f96d /innobase/trx
parentdb6cbba239f9f17abaf1ab6c6055c45355f83fde (diff)
parenta2bdf9265f3a0874f8d58bec690da4af07bca4cb (diff)
downloadmariadb-git-890b39bb68eb90f1dc6ec13c8b8e1b06f3def116.tar.gz
merge
Diffstat (limited to 'innobase/trx')
-rw-r--r--innobase/trx/trx0sys.c2
1 files changed, 1 insertions, 1 deletions
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