@@ -38,7 +38,8 @@ usage(const char *progname)
3838printf (_ (" %s [OPTION] [DATADIR]\n" ),progname );
3939printf (_ ("\nOptions:\n" ));
4040printf (_ (" [-D] DATADIR data directory\n" ));
41- printf (_ (" [-c] update catversion in pg_control to the verision of the current binary\n" ));
41+ printf (_ (" [-c] update catversion in pg_control to the verision of the current binary\n" ));
42+ printf (_ (" [-m] check if catversion in pg_control matches catverision of the current binary. Return 0 on match, 1 otherwise.\n" ));
4243printf (_ (" -V, --version output version information, then exit\n" ));
4344printf (_ (" -?, --help show this help, then exit\n" ));
4445printf (_ ("\nIf no data directory (DATADIR) is specified, "
@@ -101,6 +102,7 @@ main(int argc, char *argv[])
101102char xlogfilename [MAXFNAMELEN ];
102103int c ;
103104bool reset_catversion = false;
105+ bool check_catversion_match = false;
104106
105107set_pglocale_pgservice (argv [0 ],PG_TEXTDOMAIN ("pg_controldata" ));
106108
@@ -120,7 +122,7 @@ main(int argc, char *argv[])
120122}
121123}
122124
123- while ((c = getopt (argc ,argv ,"D:c" ))!= -1 )
125+ while ((c = getopt (argc ,argv ,"D:c:m " ))!= -1 )
124126{
125127switch (c )
126128{
@@ -130,7 +132,9 @@ main(int argc, char *argv[])
130132case 'c' :
131133reset_catversion = true;
132134break ;
133-
135+ case 'm' :
136+ check_catversion_match = true;
137+ break ;
134138default :
135139fprintf (stderr ,_ ("Try \"%s --help\" for more information.\n" ),progname );
136140exit (1 );
@@ -165,6 +169,14 @@ main(int argc, char *argv[])
165169/* get a copy of the control file */
166170ControlFile = get_controlfile (DataDir ,progname );
167171
172+ if (check_catversion_match )
173+ {
174+ if (ControlFile -> catalog_version_no == CATALOG_VERSION_NO )
175+ return 0 ;
176+ else
177+ return 1 ;
178+ }
179+
168180if (reset_catversion )
169181{
170182ControlFile -> catalog_version_no = CATALOG_VERSION_NO ;