aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2000-03-07 23:09:34 +0000
committerBruce Momjian <bruce@momjian.us>2000-03-07 23:09:34 +0000
commit91124a2f66dd6dd8935b067277c735f6b9cbe53b (patch)
treec603a18d2d82a4a6017c395fffa4214637180f5b
parent52d39d519a97f7f501e47cdabda61fa3d3477fb8 (diff)
downloadpostgresql-91124a2f66dd6dd8935b067277c735f6b9cbe53b.tar.gz
postgresql-91124a2f66dd6dd8935b067277c735f6b9cbe53b.zip
Fix problems with pg_upgrade found by Kardos, Dr. Andrea
-rw-r--r--src/bin/pg_dump/pg_dumpall4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index c4424c9232c..1402b3ffdf3 100644
--- 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