diff options
| author | Bruce Momjian <bruce@momjian.us> | 2016-02-12 17:53:36 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2016-02-12 17:53:36 -0500 |
| commit | 13a6fa3634a70f58e043c78984cd2fb626abcc16 (patch) | |
| tree | 9d7ee5a3ad57a115a444668b057c5bb709279e93 | |
| parent | 59a884e9854cb3cb7338394fb5f856209b040fb3 (diff) | |
| download | postgresql-13a6fa3634a70f58e043c78984cd2fb626abcc16.tar.gz postgresql-13a6fa3634a70f58e043c78984cd2fb626abcc16.zip | |
pg_upgrade: Add C comment about NextXID delimiter
We don't test the catversion for the NextXID delimiter change, we just
test the string contents; explain why.
Reported-by: Michael Paquier
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index 34e194cb8bb..2601827b92d 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -197,9 +197,14 @@ get_control_data(ClusterInfo *cluster, bool live_check) p++; /* remove ':' char */ cluster->controldata.chkpnt_nxtepoch = str2uint(p); + /* + * Delimiter changed from '/' to ':' in 9.6. We don't test for + * the catalog version of the change because the catalog version + * is pulled from pg_controldata too, and it isn't worth adding + * an order dependency for this --- we just check the string. + */ if (strchr(p, '/') != NULL) p = strchr(p, '/'); - /* delimiter changed from '/' to ':' in 9.6 */ else if (GET_MAJOR_VERSION(cluster->major_version) >= 906) p = strchr(p, ':'); else |