diff options
| author | heikki@hundin.mysql.fi <> | 2003-01-06 22:07:25 +0200 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-01-06 22:07:25 +0200 |
| commit | b1b47e93b130da5540cc80e0e464041ff37ea57a (patch) | |
| tree | 88f03b8d4b471aa94f27b4a3ed510bcd7c2c3ccb /innobase/trx | |
| parent | edb019aeaf616442d93db2eab0df4b2b09003d14 (diff) | |
| download | mariadb-git-b1b47e93b130da5540cc80e0e464041ff37ea57a.tar.gz | |
buf0buf.c, buf0buf.ic, buf0buf.h:
Reduce memory usage of the buffer headers
Many files:
Merge InnoDB-4.1 with AWE support
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0sys.c | 6 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index 0c10040847e..33c962772e8 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -472,9 +472,9 @@ trx_sys_update_mysql_binlog_offset( if (0 != ut_memcmp(sys_header + field + TRX_SYS_MYSQL_LOG_NAME, file_name, 1 + ut_strlen(file_name))) { - mlog_write_string((byte*) (sys_header + field - + TRX_SYS_MYSQL_LOG_NAME), - (byte*) file_name, 1 + ut_strlen(file_name), mtr); + mlog_write_string(sys_header + field + + TRX_SYS_MYSQL_LOG_NAME, + file_name, 1 + ut_strlen(file_name), mtr); } if (mach_read_from_4(sys_header + field diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index d2219ed019f..f0077f941de 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -99,7 +99,7 @@ trx_create( trx->mysql_log_file_name = NULL; trx->mysql_log_offset = 0; - trx->mysql_master_log_file_name = (char*) ""; + trx->mysql_master_log_file_name = ""; trx->mysql_master_log_pos = 0; trx->ignore_duplicates_in_insert = FALSE; |