Rename pg_upgrade variables, for clarity.

diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
index bd96b03ef4814c8c468da24c4289d1704b49af35..2ab8e4f4031f556b210b6b9cb042c5e6814cc412 100644 (file)
--- a/contrib/pg_upgrade/function.c
+++ b/contrib/pg_upgrade/function.c
@@ -27,8 +27,8 @@ install_support_functions(void)
 
    for (dbnum = 0; dbnum < new_cluster.dbarr.ndbs; dbnum++)
    {
-       DbInfo     *newdb = &new_cluster.dbarr.dbs[dbnum];
-       PGconn     *conn = connectToServer(&new_cluster, newdb->db_name);
+       DbInfo     *new_db = &new_cluster.dbarr.dbs[dbnum];
+       PGconn     *conn = connectToServer(&new_cluster, new_db->db_name);
 
        /* suppress NOTICE of dropped objects */
        PQclear(executeQueryOrDie(conn,
@@ -98,8 +98,8 @@ uninstall_support_functions(void)
 
    for (dbnum = 0; dbnum < new_cluster.dbarr.ndbs; dbnum++)
    {
-       DbInfo     *newdb = &new_cluster.dbarr.dbs[dbnum];
-       PGconn     *conn = connectToServer(&new_cluster, newdb->db_name);
+       DbInfo     *new_db = &new_cluster.dbarr.dbs[dbnum];
+       PGconn     *conn = connectToServer(&new_cluster, new_db->db_name);
 
        /* suppress NOTICE of dropped objects */
        PQclear(executeQueryOrDie(conn,