summaryrefslogtreecommitdiff
path: root/src/include/common
diff options
context:
space:
mode:
authorPeter Eisentraut2016-09-28 16:00:00 +0000
committerPeter Eisentraut2016-09-28 16:00:00 +0000
commite79e6c4da152154544913b38354b98d07b65e411 (patch)
tree5a0c8a6bff3422fc263704dd8dc4bd733c822d4a /src/include/common
parent308985b0b404a5891a1a629f38cc46c2b2dcb4be (diff)
Fix CRC check handling in get_controlfile
The previous patch broke this by returning NULL for a failed CRC check, which pg_controldata would then try to read. Fix by returning the result of the CRC check in a separate argument. Michael Paquier and myself
Diffstat (limited to 'src/include/common')
-rw-r--r--src/include/common/controldata_utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index f834624e4e7..a822cba1927 100644
--- a/src/include/common/controldata_utils.h
+++ b/src/include/common/controldata_utils.h
@@ -12,6 +12,6 @@
#include "catalog/pg_control.h"
-extern ControlFileData *get_controlfile(const char *DataDir, const char *progname);
+extern ControlFileData *get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p);
#endif /* COMMON_CONTROLDATA_UTILS_H */