diff options
| author | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
| commit | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (patch) | |
| tree | 6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /innobase/include/log0log.ic | |
| parent | b523802138eef0c66d6ce89263b512c1494a277b (diff) | |
| parent | b54698374b5eea922a6f054338d804c2ba3aa682 (diff) | |
| download | mariadb-git-219bbd5232d6ff958f97b30abbc0cb9646abf6a8.tar.gz | |
merge with 4.0
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/page/page0cur.c:
Auto merged
innobase/que/que0que.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/func_if.test:
Auto merged
Diffstat (limited to 'innobase/include/log0log.ic')
| -rw-r--r-- | innobase/include/log0log.ic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/log0log.ic b/innobase/include/log0log.ic index 16423286f6d..e273b6a292b 100644 --- a/innobase/include/log0log.ic +++ b/innobase/include/log0log.ic @@ -10,6 +10,7 @@ Created 12/9/1995 Heikki Tuuri #include "mach0data.h" #include "mtr0mtr.h" +#ifdef UNIV_LOG_DEBUG /********************************************************** Checks by parsing that the catenated log segment for a single mtr is consistent. */ @@ -21,6 +22,7 @@ log_check_log_recs( in the log_sys->buf log buffer */ ulint len, /* in: segment length in bytes */ dulint buf_start_lsn); /* in: buffer start lsn */ +#endif /* UNIV_LOG_DEBUG */ /**************************************************************** Gets a log block flush bit. */ |