pgsql: A toast relid field are no longer needed in pg_upgrade's rel arr

A toast relid field are no longer needed in pg_upgrade's rel arrays, so
remove them. Also other renaming.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=postgresql.git;a=commitdiff;h=0a5f11993195d74f23b63cc5c2d7024c6d27d7e2

Modified Files
--------------
contrib/pg_upgrade/check.c | 2 +-
contrib/pg_upgrade/info.c | 124 +++++++++++++++++---------------------
contrib/pg_upgrade/pg_upgrade.c | 6 +-
contrib/pg_upgrade/pg_upgrade.h | 7 +-
4 files changed, 63 insertions(+), 76 deletions(-)