diff options
| author | monty@mysql.com <> | 2004-06-18 04:38:58 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-18 04:38:58 +0300 |
| commit | b11d25883554a7e3da972cc593a9d2a0c6094096 (patch) | |
| tree | 7b3b07f5c8491e5a81ca71b19d92dc87ec314192 /innobase/ibuf | |
| parent | fd0153304dc0e2ada1144fc79f117f02bdcd132b (diff) | |
| parent | f56df164f0603b268806108526d59e5d02fef82b (diff) | |
| download | mariadb-git-b11d25883554a7e3da972cc593a9d2a0c6094096.tar.gz | |
Merge with 4.0.21
Diffstat (limited to 'innobase/ibuf')
| -rw-r--r-- | innobase/ibuf/ibuf0ibuf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index 931fb7f4168..f05e69863a3 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -201,15 +201,13 @@ because ibuf merge is done to a page when it is read in, and it is still physically like the index page even if the index would have been dropped! So, there seems to be no problem. */ -#ifdef UNIV_DEBUG /********************************************************************** Validates the ibuf data structures when the caller owns ibuf_mutex. */ -static + ibool ibuf_validate_low(void); /*===================*/ /* out: TRUE if ok */ -#endif /* UNIV_DEBUG */ /********************************************************************** Sets the flag in the current OS thread local storage denoting that it is @@ -3278,10 +3276,10 @@ leave_loop: mem_heap_free(heap); } -#ifdef UNIV_DEBUG + /********************************************************************** Validates the ibuf data structures when the caller owns ibuf_mutex. */ -static + ibool ibuf_validate_low(void) /*===================*/ @@ -3308,7 +3306,6 @@ ibuf_validate_low(void) return(TRUE); } -#endif /* UNIV_DEBUG */ /********************************************************************** Looks if the insert buffer is empty. */ |