Fix problems with pg_upgrade found by Kardos, Dr. Andrea

diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index c4424c9232cb91e81d0a6085198030ddc509b435..1402b3ffdf3c838d7aab1227b66c3eb1234bc22b 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall
+++ b/src/bin/pg_dump/pg_dumpall
@@ -54,11 +54,11 @@ do
    POSTGRES_USER="`echo \" \
        select usename \
        from pg_shadow \
-       where usesysid = $DBUSERID; \" | \
+       where usename = $DBUSERID; \" | \
        psql -A -q -t template1`"
    echo "${BS}connect template1 $POSTGRES_USER"
 
-   if createdb -help|grep encoding >/dev/null
+   if pg_encoding $ENCODING >/dev/null 2>&1
    then
        echo "create database $DATABASE with encoding='`pg_encoding $ENCODING`';"
    else