diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c new file mode 100644 index 8153e30..40f31ad *** a/contrib/pg_upgrade/option.c --- b/contrib/pg_upgrade/option.c *************** parseCommandLine(int argc, char *argv[]) *** 60,67 **** os_info.progname = get_progname(argv[0]); /* Process libpq env. variables; load values here for usage() output */ ! old_cluster.port = getenv("PGPORT") ? atoi(getenv("PGPORT")) : DEF_PGPORT; ! new_cluster.port = getenv("PGPORT") ? atoi(getenv("PGPORT")) : DEF_PGPORT; os_user_effective_id = get_user_info(&os_info.user); /* we override just the database user name; we got the OS id above */ --- 60,67 ---- os_info.progname = get_progname(argv[0]); /* Process libpq env. variables; load values here for usage() output */ ! old_cluster.port = atoi(getenv("OLDPGPORT"); ! new_cluster.port = atoi(getenv("NEWPGPORT"); os_user_effective_id = get_user_info(&os_info.user); /* we override just the database user name; we got the OS id above */ *************** parseCommandLine(int argc, char *argv[]) *** 214,219 **** --- 214,223 ---- validateDirectoryOption(&new_cluster.pgdata, "NEWDATADIR", "-D", "new cluster data resides"); + if (old_cluster.port == 0 || new_cluster.port == 0) + pg_log(PG_FATAL, "You must specify both old and new port numbers\n" + "They can be the same, except when running check on an active old server\n"); + get_pkglibdirs(); } diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml new file mode 100644 index a505707..c56165f *** a/doc/src/sgml/pgupgrade.sgml --- b/doc/src/sgml/pgupgrade.sgml *************** *** 105,111 **** ! link instead of copying files to new cluster --- 105,111 ---- ! use hard links instead of copying files to the new cluster *************** *** 117,131 **** old_port_number old_portnum ! the old cluster port number; environment ! variable PGPORT new_port_number new_portnum ! the new cluster port number; environment ! variable PGPORT --- 117,131 ---- old_port_number old_portnum ! the old cluster port number; environment variable ! OLDPGPORT new_port_number new_portnum ! the new cluster port number; environment variable ! NEWPGPORT *************** mv /usr/local/pgsql /usr/local/pgsql.old *** 201,209 **** Install the new PostgreSQL binaries ! Install the new server's binaries and support files. You can use the ! same port numbers for both clusters, typically 5432, because the old and ! new clusters will not be running at the same time. --- 201,207 ---- Install the new PostgreSQL binaries ! Install the new server's binaries and support files. *************** gmake prefix=/usr/local/pgsql.new instal *** 256,263 **** so you might want to set authentication to trust in pg_hba.conf, or if using md5 authentication, use a ~/.pgpass file (see ) ! to avoid being prompted repeatedly for a password. Also make sure ! pg_upgrade is the only program that can connect to the clusters. --- 254,260 ---- so you might want to set authentication to trust in pg_hba.conf, or if using md5 authentication, use a ~/.pgpass file (see ) ! to avoid being prompted repeatedly for a password. *************** NET STOP pgsql-8.3 (Postgr *** 293,303 **** Always run the pg_upgrade binary of the new server, not the old one. pg_upgrade requires the specification of the old and new cluster's ! data and executable (bin) directories. You can also specify separate ! user and port values, and whether you want the data linked instead of ! copied (the default). If you use linking, the upgrade will be much ! faster (hard link data files rather than copying them), but you ! will no longer be able to access your old cluster once you start the new cluster after the upgrade. Link mode also requires that the old and new cluster data directories be in the same file system. See pg_upgrade --help for a full list of options. --- 290,312 ---- Always run the pg_upgrade binary of the new server, not the old one. pg_upgrade requires the specification of the old and new cluster's ! data and executable (bin) directories, and their port ! numbers. When checking a running old server, specify the current ! old server's port number and specify an unused port number greater ! than 1023 for the new cluster. Specifying an unused port number ! helps prevent users from accidentally connecting to the server ! during the check. For actual upgrades, specify a similar unused ! port number for the old and new servers; you can use the same ! port number for both because the old and new servers never ! run at the same time during an upgrade. Again, use an unused ! port number to avoid accidental user connections. ! ! ! ! You can also specify a user name and whether you want the data ! linked instead of copied (the default). If you use link mode, ! the upgrade will be much faster (no file copying), but you ! will not be able to access your old cluster once you start the new cluster after the upgrade. Link mode also requires that the old and new cluster data directories be in the same file system. See pg_upgrade --help for a full list of options. *************** pg_upgrade.exe *** 320,325 **** --- 329,336 ---- --new-datadir "C:/Program Files/PostgreSQL/9.0/data" --old-bindir "C:/Program Files/PostgreSQL/8.4/bin" --new-bindir "C:/Program Files/PostgreSQL/9.0/bin" + --old-port 5723 + --new-port 5723 Once started, pg_upgrade will verify the two clusters are compatible