diff options
Diffstat (limited to 'contrib/pg_upgrade/check.c')
| -rw-r--r-- | contrib/pg_upgrade/check.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 60c1fbbf97..fdec6e34af 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -362,7 +362,7 @@ check_new_cluster_is_empty(void) /* pg_largeobject and its index should be skipped */ if (strcmp(rel_arr->rels[relnum].nspname, "pg_catalog") != 0) pg_log(PG_FATAL, "New cluster database \"%s\" is not empty\n", - new_cluster.dbarr.dbs[dbnum].db_name); + new_cluster.dbarr.dbs[dbnum].db_name); } } @@ -381,17 +381,18 @@ check_new_cluster_is_empty(void) static void check_old_cluster_has_new_cluster_dbs(void) { - int old_dbnum, new_dbnum; + int old_dbnum, + new_dbnum; for (new_dbnum = 0; new_dbnum < new_cluster.dbarr.ndbs; new_dbnum++) { for (old_dbnum = 0; old_dbnum < old_cluster.dbarr.ndbs; old_dbnum++) if (strcmp(old_cluster.dbarr.dbs[old_dbnum].db_name, - new_cluster.dbarr.dbs[new_dbnum].db_name) == 0) + new_cluster.dbarr.dbs[new_dbnum].db_name) == 0) break; if (old_dbnum == old_cluster.dbarr.ndbs) pg_log(PG_FATAL, "New cluster database \"%s\" does not exist in the old cluster\n", - new_cluster.dbarr.dbs[new_dbnum].db_name); + new_cluster.dbarr.dbs[new_dbnum].db_name); } } @@ -495,7 +496,7 @@ check_is_super_user(ClusterInfo *cluster) if (PQntuples(res) != 1 || strcmp(PQgetvalue(res, 0, 0), "t") != 0) pg_log(PG_FATAL, "database user \"%s\" is not a superuser\n", - os_info.user); + os_info.user); PQclear(res); |