diff options
author | heikki@hundin.mysql.fi <> | 2002-11-07 14:47:25 +0200 |
---|---|---|
committer | heikki@hundin.mysql.fi <> | 2002-11-07 14:47:25 +0200 |
commit | b31f909d7b756813993cc0f8f0d4d707aa2c2d20 (patch) | |
tree | 55c72cdc1d8c91f0b56057c2e2c01f7ce3c93883 /innobase/trx/trx0sys.c | |
parent | aa4e1658080ef50072f796773d2723e723d01ff0 (diff) | |
download | mariadb-git-b31f909d7b756813993cc0f8f0d4d707aa2c2d20.tar.gz |
Many files:
Fix hang introduced by selective deadlock resolution
srv0srv.c, row0mysql.c:
Fix hang introduced by selective deadlock resolution + corruption caused by lock timeout or sel deadl res in ON DELETE CASCADE
Diffstat (limited to 'innobase/trx/trx0sys.c')
-rw-r--r-- | innobase/trx/trx0sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index 19cf52c8676..33c962772e8 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, - (byte*) file_name, 1 + ut_strlen(file_name), mtr); + file_name, 1 + ut_strlen(file_name), mtr); } if (mach_read_from_4(sys_header + field |