diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-22 09:50:59 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-22 09:50:59 +0200 |
| commit | 192bf819eb2bb91e383327d3bde6f596c20a82db (patch) | |
| tree | dceddcd17cf1278b50f8838476df5644f764efe9 /innobase/log | |
| parent | 984750e13ef4a559c5da05b5fbd6fa363d3650b2 (diff) | |
| parent | 522e83b64ab46d400ccb6aa8d7b749eefc28f4d5 (diff) | |
| download | mariadb-git-192bf819eb2bb91e383327d3bde6f596c20a82db.tar.gz | |
merge with 4.0
BitKeeper/etc/ignore:
auto-union
VC++Files/comp_err/comp_err.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
acinclude.m4:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/com/com0shm.c:
Auto merged
innobase/data/data0data.c:
Auto merged
innobase/ha/ha0ha.c:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/ibuf0ibuf.h:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/mtr0log.h:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/include/os0proc.h:
Auto merged
innobase/include/os0thread.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/mtr/mtr0mtr.c:
Auto merged
innobase/os/os0proc.c:
Auto merged
innobase/page/page0page.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0rec.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'innobase/log')
| -rw-r--r-- | innobase/log/log0recv.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index 01679a374b0..0a1115a6891 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -181,9 +181,10 @@ recv_sys_empty_hash(void) recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256); } +#ifndef UNIV_LOG_DEBUG /************************************************************ Frees the recovery system. */ - +static void recv_sys_free(void) /*===============*/ @@ -200,6 +201,7 @@ recv_sys_free(void) mutex_exit(&(recv_sys->mutex)); } +#endif /* !UNIV_LOG_DEBUG */ /************************************************************ Truncates possible corrupted or extra records from a log group. */ @@ -358,7 +360,7 @@ Copies a log segment from the most up-to-date log group to the other log groups, so that they all contain the latest log data. Also writes the info about the latest checkpoint to the groups, and inits the fields in the group memory structs to up-to-date values. */ - +static void recv_synchronize_groups( /*====================*/ @@ -1803,10 +1805,11 @@ recv_calc_lsn_on_data_add( return(ut_dulint_add(lsn, lsn_len)); } +#ifdef UNIV_LOG_DEBUG /*********************************************************** Checks that the parser recognizes incomplete initial segments of a log record as incomplete. */ - +static void recv_check_incomplete_log_recs( /*===========================*/ @@ -1824,6 +1827,7 @@ recv_check_incomplete_log_recs( &page_no, &body)); } } +#endif /* UNIV_LOG_DEBUG */ /*********************************************************** Prints diagnostic info of corrupt log. */ |