diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-01-24 11:53:15 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-01-24 11:55:10 -0300 |
| commit | 2494a9af4c8523f33ec78cd092d21a17780b4b5c (patch) | |
| tree | bcf10c0fde05dbb0df0d5c248427ddb4a0eb3e9d /contrib/pg_upgrade | |
| parent | 6772c1e542569980e54db8ff87667811dc5f9e86 (diff) | |
| download | postgresql-2494a9af4c8523f33ec78cd092d21a17780b4b5c.tar.gz | |
Don't require oldestMultixact if server doesn't have it
Diffstat (limited to 'contrib/pg_upgrade')
| -rw-r--r-- | contrib/pg_upgrade/controldata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c index f4252af4ed..2ea0ce442d 100644 --- a/contrib/pg_upgrade/controldata.c +++ b/contrib/pg_upgrade/controldata.c @@ -469,7 +469,8 @@ get_control_data(ClusterInfo *cluster, bool live_check) /* verify that we got all the mandatory pg_control data */ if (!got_xid || !got_oid || - !got_multi || !got_mxoff || !got_oldestmulti || + !got_multi || !got_mxoff || + (!got_oldestmulti && GET_MAJOR_VERSION(cluster->major_version) >= 903) || (!live_check && !got_nextxlogfile) || !got_tli || !got_align || !got_blocksz || !got_largesz || !got_walsz || @@ -492,7 +493,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) if (!got_mxoff) pg_log(PG_REPORT, " latest checkpoint next MultiXactOffset\n"); - if (!got_oldestmulti) + if (!got_oldestmulti && GET_MAJOR_VERSION(cluster->major_version) >= 903) pg_log(PG_REPORT, " latest checkpoint oldest MultiXactId\n"); if (!live_check && !got_nextxlogfile) |