pgsql: Fix new SQL tablespace location function usage in pg_upgrade to

Fix new SQL tablespace location function usage in pg_upgrade to properly
check cluster version numbers, and fix missing table alias.

Branch
------
master

Details
-------
http://git.postgresql.org/pg/commitdiff/b95aec529014355f4f90c5095993404ff0291b02

Modified Files
--------------
contrib/pg_upgrade/info.c | 4 ++--
contrib/pg_upgrade/tablespace.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)