diff options
| author | unknown <monty@mysql.com> | 2004-03-17 10:30:40 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-17 10:30:40 +0200 |
| commit | b523802138eef0c66d6ce89263b512c1494a277b (patch) | |
| tree | 2f18de7b832ebd37828631dccd3562ffc5611fa7 /innobase | |
| parent | a8aacf87648f64e7489220dab7d8729c5c01e13d (diff) | |
| download | mariadb-git-b523802138eef0c66d6ce89263b512c1494a277b.tar.gz | |
After merge fixes
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/dict/dict0dict.c | 2 | ||||
| -rw-r--r-- | innobase/fsp/fsp0fsp.c | 4 | ||||
| -rw-r--r-- | innobase/log/log0log.c | 4 | ||||
| -rw-r--r-- | innobase/que/que0que.c | 3 | ||||
| -rw-r--r-- | innobase/row/row0mysql.c | 2 | ||||
| -rw-r--r-- | innobase/trx/trx0sys.c | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index bf60567ceaa..ac79a2f0eb0 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -3636,7 +3636,7 @@ dict_tree_free( dict_tree_t* tree) /* in, own: index tree */ { ut_a(tree); - ut_a(tree->magic_n == DICT_TREE_MAGIC_N); + ut_ad(tree->magic_n == DICT_TREE_MAGIC_N); rw_lock_free(&(tree->lock)); mem_free(tree); diff --git a/innobase/fsp/fsp0fsp.c b/innobase/fsp/fsp0fsp.c index 9be6e1a6e50..77535e4c524 100644 --- a/innobase/fsp/fsp0fsp.c +++ b/innobase/fsp/fsp0fsp.c @@ -3004,8 +3004,8 @@ fseg_free_page_low( /* If we get here, the page is in some extent of the segment */ - descr_id = mtr_read_dulint(descr + XDES_ID, MLOG_8BYTES, mtr); - seg_id = mtr_read_dulint(seg_inode + FSEG_ID, MLOG_8BYTES, mtr); + descr_id = mtr_read_dulint(descr + XDES_ID, mtr); + seg_id = mtr_read_dulint(seg_inode + FSEG_ID, mtr); /* fprintf(stderr, "InnoDB: InnoDB is freeing space %lu page %lu,\n" diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c index 095d84f6527..cd6e6e803a7 100644 --- a/innobase/log/log0log.c +++ b/innobase/log/log0log.c @@ -2560,7 +2560,7 @@ loop: start_lsn = log_sys->archived_lsn; if (calc_new_limit) { - ut_a(log_sys->archive_buf_size % OS_FILE_LOG_BLOCK_SIZE + ut_a(log_sys->archive_buf_size % OS_FILE_LOG_BLOCK_SIZE == 0); limit_lsn = ut_dulint_add(start_lsn, log_sys->archive_buf_size); @@ -2614,6 +2614,7 @@ loop: log_sys->next_archived_lsn = limit_lsn; +#ifdef UNIV_LOG_DEBUG if (log_debug_writes) { printf("Archiving from lsn %lu %lu to lsn %lu %lu\n", (ulong) ut_dulint_get_high(log_sys->archived_lsn), @@ -2621,6 +2622,7 @@ loop: (ulong) ut_dulint_get_high(limit_lsn), (ulong) ut_dulint_get_low(limit_lsn)); } +#endif /* UNIV_LOG_DEBUG */ /* Read the log segment to the archive buffer */ diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c index 127e7f84576..d31b4e6813c 100644 --- a/innobase/que/que0que.c +++ b/innobase/que/que0que.c @@ -1093,8 +1093,7 @@ que_node_print_info( str = "UNKNOWN NODE TYPE"; } - fprintf(stderr, "Node type %lu: %s, address %lx\n", (unsigned long) type, str, - (unsigned long) addr); + fprintf(stderr, "Node type %lu: %s, address %p\n", (ulong) type, str, node); } /************************************************************************** diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index efcca623a76..49e5aeac2e4 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -1934,7 +1934,7 @@ row_discard_tablespace_for_mysql( graph->fork_type = QUE_FORK_MYSQL_INTERFACE; - ut_a(thr = que_fork_start_command(graph, SESS_COMM_EXECUTE, 0)); + ut_a(thr = que_fork_start_command(graph)); que_run_threads(thr); diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c index e7439935b7e..57cfcef7d6f 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -134,7 +134,9 @@ trx_sys_mark_upgraded_to_multiple_tablespaces(void) mtr_start(&mtr); page = buf_page_get(TRX_SYS_SPACE, TRX_SYS_PAGE_NO, RW_X_LATCH, &mtr); +#ifdef UNIV_SYNC_DEBUG buf_page_dbg_add_level(page, SYNC_NO_ORDER_CHECK); +#endif /* UNIV_SYNC_DEBUG */ doublewrite = page + TRX_SYS_DOUBLEWRITE; |