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 | d587a36aa131b74d75da6d456ce297f8f8c893e3 (patch) | |
| tree | df8a781b0b9fee71976881b14f7cbd640b3068ba /innobase/sync | |
| parent | e4042c25ef4c7162046e953198dfd56bc80db1f8 (diff) | |
| download | mariadb-git-d587a36aa131b74d75da6d456ce297f8f8c893e3.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/sync')
| -rw-r--r-- | innobase/sync/sync0rw.c | 2 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/innobase/sync/sync0rw.c b/innobase/sync/sync0rw.c index 9dd5148e27a..e3caa24cb1e 100644 --- a/innobase/sync/sync0rw.c +++ b/innobase/sync/sync0rw.c @@ -157,7 +157,6 @@ rw_lock_free( mutex_exit(&rw_lock_list_mutex); } -#ifdef UNIV_DEBUG /********************************************************************** Checks that the rw-lock has been initialized and that there are no simultaneous shared and exclusive locks. */ @@ -185,7 +184,6 @@ rw_lock_validate( return(TRUE); } -#endif /* UNIV_DEBUG */ /********************************************************************** Lock an rw-lock in shared mode for the current thread. If the rw-lock is diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 0897cc72a4f..5ee08d83987 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -299,7 +299,6 @@ mutex_enter_nowait( return(1); } -#ifdef UNIV_DEBUG /********************************************************************** Checks that the mutex has been initialized. */ @@ -313,7 +312,6 @@ mutex_validate( return(TRUE); } -#endif /* UNIV_DEBUG */ /********************************************************************** Sets the waiters field in a mutex. */ @@ -1060,12 +1058,8 @@ sync_thread_add_level( } else if (level == SYNC_DICT_HEADER) { ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER)); } else if (level == SYNC_DICT) { -#ifdef UNIV_DEBUG - ut_a(buf_debug_prints || - sync_thread_levels_g(array, SYNC_DICT)); -#else /* UNIV_DEBUG */ - ut_a(sync_thread_levels_g(array, SYNC_DICT)); -#endif /* UNIV_DEBUG */ + ut_a(buf_debug_prints + || sync_thread_levels_g(array, SYNC_DICT)); } else { ut_error; } |