diff options
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0sys.c | 3 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index 6c9776560bd..32a1db48488 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -438,7 +438,6 @@ trx_sys_update_mysql_binlog_offset( trx_sysf_t* sys_header; char namebuf[TRX_SYS_MYSQL_LOG_NAME_LEN]; - ut_ad(mutex_own(&kernel_mutex)); ut_ad(trx->mysql_log_file_name); memset(namebuf, ' ', TRX_SYS_MYSQL_LOG_NAME_LEN - 1); @@ -524,7 +523,7 @@ trx_sys_print_mysql_binlog_offset(void) } fprintf(stderr, - "InnoDB: Last MySQL binlog file offset %lu %lu, file name %s\n", + "InnoDB: Last MySQL binlog file position %lu %lu, file name %s\n", mach_read_from_4(sys_header + TRX_SYS_MYSQL_LOG_INFO + TRX_SYS_MYSQL_LOG_OFFSET_HIGH), mach_read_from_4(sys_header + TRX_SYS_MYSQL_LOG_INFO diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 607c80edd09..87b82cbee3a 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -71,6 +71,9 @@ trx_create( trx->type = TRX_USER; trx->conc_state = TRX_NOT_STARTED; + trx->check_foreigns = TRUE; + trx->check_unique_secondary = TRUE; + trx->dict_operation = FALSE; trx->mysql_thd = NULL; @@ -113,6 +116,7 @@ trx_create( trx->lock_heap = mem_heap_create_in_buffer(256); UT_LIST_INIT(trx->trx_locks); + trx->has_dict_foreign_key_check_lock = FALSE; trx->has_search_latch = FALSE; trx->search_latch_timeout = BTR_SEA_TIMEOUT; @@ -703,8 +707,7 @@ trx_commit_off_kernel( /*-------------------------------------*/ - /* Only in some performance tests the variable srv_flush.. - will be set to FALSE: */ + /* Most MySQL users run with srv_flush.. set to FALSE: */ if (srv_flush_log_at_trx_commit) { |