database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Remove all mentions of EnterpriseDB Advanced Server from pg_upgrade;

Browse Source 
EDB must maintain their own patch set for this.
This commit is contained in:
Bruce Momjian
2010-05-13 22:51:00 +00:00
parent 382ff21203
commit 36d3afd2d4
9 changed files with 20 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/pg_upgrade/controldata.c
View File

@ -9,10 +9,6 @@
#include <ctype.h>
#include <stdlib.h>
#ifdef EDB_NATIVE_LANG
#include "access/tuptoaster.h"
#endif
/*
* get_control_data()
@ -88,15 +84,6 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
got_float8_pass_by_value = true;
}
#ifdef EDB_NATIVE_LANG
/* EDB AS 8.3 is an 8.2 code base */
if (cluster->is_edb_as && GET_MAJOR_VERSION(cluster->major_version) <= 803)
{
cluster->controldata.toast = TOAST_MAX_CHUNK_SIZE;
got_toast = true;
}
#endif
/* we have the result of cmd in "output". so parse it line by line now */
while (fgets(bufin, sizeof(bufin), output))
{
@ -140,9 +127,7 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
p++; /* removing ':' char */
cluster->controldata.cat_ver = (uint32) atol(p);
}
else if ((p = strstr(bufin, "First log file ID after reset:")) != NULL ||
(cluster->is_edb_as && GET_MAJOR_VERSION(cluster->major_version) <= 803 &&
(p = strstr(bufin, "Current log file ID:")) != NULL))
else if ((p = strstr(bufin, "First log file ID after reset:")) != NULL)
{
p = strchr(p, ':');
@ -153,9 +138,7 @@ get_control_data(migratorContext *ctx, ClusterInfo *cluster, bool live_check)
cluster->controldata.logid = (uint32) atol(p);
got_log_id = true;
}
else if ((p = strstr(bufin, "First log file segment after reset:")) != NULL ||
(cluster->is_edb_as && GET_MAJOR_VERSION(cluster->major_version) <= 803 &&
(p = strstr(bufin, "Next log file segment:")) != NULL))
else if ((p = strstr(bufin, "First log file segment after reset:")) != NULL)
{
p = strchr(p, ':');