1. miscadmin.h needs to include sys/types.h for a definition of pid_t

2. Regression tests fail for types int2 and int4 (which can easily be
fixed by adding entries to resultmap) aswell as float8 and geometry,
where floating point numbers appear to be rounded a little differently
than in your expected results (besides that I also need the positive
zeros file). I'm including a patch for the first 2, but I don't know
whether the latter two are actually a bug in postgres or a bug in the
OS or even allowed difference. I'm including my results for reference.

Rolf Grossmann

3 files changed, 11 insertions, 4 deletions

diff --git a/src/bin/pg_dump/pg_upgrade b/src/bin/pg_dump/pg_upgrade
index e4ec038e2a1..5d03e20ca0d 100755
--- a/src/bin/pg_dump/pg_upgrade
+++ b/src/bin/pg_dump/pg_upgrade
@@ -3,7 +3,7 @@
 # pg_upgrade: update a database without needing a full dump/reload cycle.
 # CAUTION: read the manual page before trying to use this!
 
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_upgrade,v 1.13 1999/09/28 18:04:18 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_upgrade,v 1.14 2000/02/23 15:46:12 momjian Exp $
 #
 # NOTE: we must be sure to update the version-checking code a few dozen lines
 # below for each new PostgreSQL release.
@@ -75,7 +75,7 @@ SRCVERSION=`cat ./$OLDDIR/PG_VERSION`
 # This code will need to be updated/reviewed for each new PostgreSQL release.
 
 # MYVERSION is the expected output database version
-MYVERSION="6.6"
+MYVERSION="7.0"
 
 if [ "$DESTVERSION" != "$MYVERSION" ]
 then	echo "$0 is for PostgreSQL version $MYVERSION, but ./data/PG_VERSION contains $DESTVERSION." 1>&2
@@ -91,7 +91,7 @@ fi
 
 case "$SRCVERSION" in
     6.5) ;;
-    6.6) ;;
+    7.0) ;;
     *)	echo "Sorry, `basename $0` cannot upgrade database version $SRCVERSION to $DESTVERSION." 1>&2
 	echo "The on-disk structure of tables has changed." 1>&2
 	echo "You will need to dump and restore using pg_dump." 1>&2
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 4b9e0034545..3d5dbae01fb 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.53 2000/02/22 09:55:20 inoue Exp $
+ * $Id: miscadmin.h,v 1.54 2000/02/23 15:46:14 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -23,6 +23,8 @@
 #ifndef MISCADMIN_H
 #define MISCADMIN_H
 
+#include <sys/types.h>				/* For pid_t */
+
 #include "postgres.h"
 
 #include "utils/trace.h"
diff --git a/src/test/regress/resultmap b/src/test/regress/resultmap
index 94aea1471ca..c025681d386 100644
--- a/src/test/regress/resultmap
+++ b/src/test/regress/resultmap
@@ -2,15 +2,20 @@ int2/hppa=int2-too-large
 int4/hppa=int4-too-large
 int2/.*-netbsd=int2-too-large
 int4/.*-netbsd=int4-too-large
+int2/.*-freebsd=int2-too-large
+int4/.*-freebsd=int4-too-large
 int2/i.86-pc-linux-gnulibc=int2-not-representable
 int4/i.86-pc-linux-gnulibc=int4-not-representable
 int2/sparc-sun-solaris=int2-too-large
 int4/sparc-sun-solaris=int4-too-large
 geometry/hppa=geometry-positive-zeros
 geometry/.*-netbsd=geometry-positive-zeros
+geometry/.*-freebsd=geometry-positive-zeros
 geometry/i.86-.*-gnulibc=geometry-i86-gnulibc
 geometry/sparc-sun-solaris=geometry-solaris-precision
 horology/hppa=horology-no-DST-before-1970
 horology/sparc-sun-solaris=horology-solaris-1947
 abstime/sparc-sun-solaris=abstime-solaris-1947
 tinterval/sparc-sun-solaris=tinterval-solaris-1947
+#include <sys/types.h>				/* For pid_t */
+