diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-06-16 13:41:14 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-06-16 13:41:14 +0300 |
| commit | 9ed3c7600caa4ab2c5f5af93327f86cb6e42eaf4 (patch) | |
| tree | df8a781b0b9fee71976881b14f7cbd640b3068ba /innobase/buf/buf0buf.c | |
| parent | 87cc8af1f1e1cac9e9fa3612935a20eed88d950f (diff) | |
| download | mariadb-git-9ed3c7600caa4ab2c5f5af93327f86cb6e42eaf4.tar.gz | |
InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may
be needed when testing production releases
innobase/btr/btr0btr.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0buf.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0flu.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0lru.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0rea.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/data/data0type.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/dict/dict0dict.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/fsp/fsp0fsp.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/fut/fut0lst.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/ibuf/ibuf0ibuf.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/btr0btr.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.ic:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0flu.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0lru.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/data0type.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/dict0dict.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fsp0fsp.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fut0lst.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/lock0lock.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.ic:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0pool.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mtr0mtr.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/pars0opt.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0rw.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0sync.h:
Remove #ifdef UNIV_DEBUG around debug code
innobase/lock/lock0lock.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0dbg.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0pool.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/mtr/mtr0mtr.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/pars/pars0opt.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/srv/srv0start.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0rw.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0sync.c:
Remove #ifdef UNIV_DEBUG around debug code
innobase/trx/trx0roll.c:
Remove #ifdef UNIV_DEBUG around debug code
Diffstat (limited to 'innobase/buf/buf0buf.c')
| -rw-r--r-- | innobase/buf/buf0buf.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c index a7bf9cf1d2f..b744430a76e 100644 --- a/innobase/buf/buf0buf.c +++ b/innobase/buf/buf0buf.c @@ -201,14 +201,12 @@ the read requests for the whole area. */ buf_pool_t* buf_pool = NULL; /* The buffer buf_pool of the database */ -#ifdef UNIV_DEBUG -static ulint buf_dbg_counter = 0; /* This is used to insert validation +ulint buf_dbg_counter = 0; /* This is used to insert validation operations in excution in the debug version */ ibool buf_debug_prints = FALSE; /* If this is set TRUE, the program prints info whenever read-ahead or flush occurs */ -#endif /* UNIV_DEBUG */ /************************************************************************ Calculates a page checksum which is stored to the page when it is written @@ -1457,12 +1455,10 @@ buf_page_create( /* If we get here, the page was not in buf_pool: init it there */ -#ifdef UNIV_DEBUG if (buf_debug_prints) { fprintf(stderr, "Creating space %lu page %lu to buffer\n", space, offset); } -#endif /* UNIV_DEBUG */ block = free_block; @@ -1613,11 +1609,9 @@ buf_page_io_complete( rw_lock_x_unlock_gen(&(block->lock), BUF_IO_READ); rw_lock_x_unlock_gen(&(block->read_lock), BUF_IO_READ); -#ifdef UNIV_DEBUG if (buf_debug_prints) { fputs("Has read ", stderr); } -#endif /* UNIV_DEBUG */ } else { ut_ad(io_type == BUF_IO_WRITE); @@ -1630,21 +1624,17 @@ buf_page_io_complete( buf_pool->n_pages_written++; -#ifdef UNIV_DEBUG if (buf_debug_prints) { fputs("Has written ", stderr); } -#endif /* UNIV_DEBUG */ } mutex_exit(&(buf_pool->mutex)); -#ifdef UNIV_DEBUG if (buf_debug_prints) { fprintf(stderr, "page space %lu page no %lu\n", block->space, block->offset); } -#endif /* UNIV_DEBUG */ } /************************************************************************* @@ -1673,7 +1663,6 @@ buf_pool_invalidate(void) mutex_exit(&(buf_pool->mutex)); } -#ifdef UNIV_DEBUG /************************************************************************* Validates the buffer buf_pool data structure. */ @@ -1872,7 +1861,6 @@ buf_print(void) ut_a(buf_validate()); } -#endif /* UNIV_DEBUG */ /************************************************************************* Returns the number of pending buf pool ios. */ |