database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-18 04:29:09 +03:00
Code Activity

Fix version numbering foulups exposed by 10.1.

Browse Source 
configure computed PG_VERSION_NUM incorrectly.  (Coulda sworn I tested
that logic back when, but it had an obvious thinko.)

pg_upgrade had not been taught about the new dispensation with just
one part in the major version number.

Both things accidentally failed to fail with 10.0, but with 10.1 we
got the wrong results.

Per buildfarm.
This commit is contained in:
Tom Lane
2017-11-06 19:46:52 -05:00
parent 92d830f4bf
commit d0c80c17f1
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/pg_upgrade/exec.c
View File

@@ -26,7 +26,7 @@ static int win32_check_directory_write_permissions(void);
/*
* get_bin_version
*
* Fetch versions of binaries for cluster.
* Fetch major version of binaries for cluster.
*/
static void
get_bin_version(ClusterInfo *cluster)
@@ -34,8 +34,8 @@ get_bin_version(ClusterInfo *cluster)
char cmd[MAXPGPATH],
cmd_output[MAX_STRING];
FILE *output;
int pre_dot = 0,
post_dot = 0;
int v1 = 0,
v2 = 0;
snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" --version", cluster->bindir);
@@ -46,14 +46,19 @@ get_bin_version(ClusterInfo *cluster)
pclose(output);
/* Remove trailing newline */
if (strchr(cmd_output, '\n') != NULL)
*strchr(cmd_output, '\n') = '\0';
if (sscanf(cmd_output, "%*s %*s %d.%d", &pre_dot, &post_dot) < 1)
if (sscanf(cmd_output, "%*s %*s %d.%d", &v1, &v2) < 1)
pg_fatal("could not get pg_ctl version output from %s\n", cmd);
cluster->bin_version = (pre_dot * 100 + post_dot) * 100;
if (v1 < 10)
{
/* old style, e.g. 9.6.1 */
cluster->bin_version = v1 * 10000 + v2 * 100;
}
else
{
/* new style, e.g. 10.1 */
cluster->bin_version = v1 * 10000;
}
}