From 9834b32286447c514dd77690699a4ca075c972fc Mon Sep 17 00:00:00 2001 From: robocop Date: Fri, 20 Nov 2009 11:29:47 +0000 Subject: [PATCH] Get rid of obsolete field for replay logging. --- src/jrd/dmp.cpp | 5 +++-- src/jrd/ods.h | 2 +- src/utilities/gstat/ppg.cpp | 3 ++- src/utilities/rebuild/rebuild.cpp | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/jrd/dmp.cpp b/src/jrd/dmp.cpp index 6701081832..3641b0f5cd 100644 --- a/src/jrd/dmp.cpp +++ b/src/jrd/dmp.cpp @@ -727,14 +727,15 @@ static void dmp_header(const header_page* page) printf("\tSweep interval: %ld\n", number); break; + /* case HDR_log_name: printf("\tLog file name: %*s\n", p[1], p + 2); break; -/* + case HDR_journal_file: printf("\tJournal file: %*s\n", p[1], p + 2); break; -*/ + */ case HDR_password_file_key: printf("\tPassword file key: (can't print)\n"); break; diff --git a/src/jrd/ods.h b/src/jrd/ods.h index 65f350a0a2..3a748b3361 100644 --- a/src/jrd/ods.h +++ b/src/jrd/ods.h @@ -416,7 +416,7 @@ const UCHAR HDR_file = 3; // Secondary file const UCHAR HDR_last_page = 4; // Last logical page number of file //const UCHAR HDR_unlicensed = 5; // Count of unlicensed activity const UCHAR HDR_sweep_interval = 6; // Transactions between sweeps -const UCHAR HDR_log_name = 7; // replay log name +//const UCHAR HDR_log_name = 7; // replay log name //const UCHAR HDR_journal_file = 8; // Intermediate journal file const UCHAR HDR_password_file_key = 9; // Key to compare to password db //const UCHAR HDR_backup_info = 10; // WAL backup information diff --git a/src/utilities/gstat/ppg.cpp b/src/utilities/gstat/ppg.cpp index 931999b680..7cee4000d2 100644 --- a/src/utilities/gstat/ppg.cpp +++ b/src/utilities/gstat/ppg.cpp @@ -234,12 +234,13 @@ void PPG_print_header(const header_page* header, SLONG page, uSvc->printf("\tSweep interval:\t\t%ld\n", number); break; +/* case HDR_log_name: memcpy(temp, p + 2, p[1]); temp[p[1]] = '\0'; uSvc->printf("\tReplay logging file:\t\t%s\n", temp); break; -/* + case HDR_cache_file: memcpy(temp, p + 2, p[1]); temp[p[1]] = '\0'; diff --git a/src/utilities/rebuild/rebuild.cpp b/src/utilities/rebuild/rebuild.cpp index 3aa9eef035..78219bf549 100644 --- a/src/utilities/rebuild/rebuild.cpp +++ b/src/utilities/rebuild/rebuild.cpp @@ -1015,11 +1015,11 @@ static void print_db_header( FILE* file, const header_page* header) memcpy(&number, p + 2, sizeof(number)); fprintf(file, "\tSweep interval: %ld\n", number); break; - +/* case HDR_log_name: fprintf(file, "\tReplay logging file: %*s\n", p[1], p + 2); break; -/* + case HDR_journal_file: fprintf(file, "\tJournal file: %*s\n", p[1], p + 2); break;