diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-08-13 00:00:41 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-08-13 00:16:31 +0200 |
| commit | d0dde35ee713c7afcd24653e2cececbdf3ede0bf (patch) | |
| tree | c42e29a796b61df2561927be4bdf796d393834ea | |
| parent | ba78b6bc617750dcfca80dc742493811b3e54490 (diff) | |
| download | postgresql-d0dde35ee713c7afcd24653e2cececbdf3ede0bf.tar.gz | |
pg_upgrade: Fix some minor code issues
96ef3b8ff1cf1950e897fd2f766d4bd9ef0d5d56 accidentally copied a not
applicable comment from the float8_pass_by_value code to the
data_checksums code. Remove that.
87d3b35a1ca31a9d947a8f919a6006679216dff0 changed pg_upgrade to
checking the checksum version rather than just the Boolean presence of
checksums, but didn't change the field type in its ControlData struct
from bool. So this would not work correctly if there ever is a
checksum version larger than 1.
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 1 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index fcbc28946d..97f03a1ae9 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -493,7 +493,6 @@ get_control_data(ClusterInfo *cluster, bool live_check) pg_fatal("%d: controldata retrieval problem\n", __LINE__); p++; /* remove ':' char */ - /* used later for contrib check */ cluster->controldata.data_checksum_version = str2uint(p); got_data_checksum_version = true; } diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index 4eae959a39..2d2b4fa1f2 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -227,7 +227,7 @@ typedef struct uint32 large_object; bool date_is_int; bool float8_pass_by_value; - bool data_checksum_version; + uint32 data_checksum_version; } ControlData; /* |