Restored original pg_type/pg_attribute defaults. Regression fixes.

2 files changed, 6 insertions, 8 deletions

diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input
index eac0e28fc37..5e3e57c0809 100644
--- a/src/test/regress/expected.input
+++ b/src/test/regress/expected.input
@@ -2106,11 +2106,11 @@ QUERY: SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
 WARN:	Bad float8 input format -- overflow
 
 QUERY: SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
-WARN:pow() returned a floating point out of the range
+WARN:	Bad float8 input format -- overflow
 
-QUERY: SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
+QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 = '0.0' ;
 WARN:can't take log of 0!
-QUERY: SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ;
 WARN:can't take log of a negative number
 QUERY: SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;
 WARN:exp() returned a floating point out of range
@@ -6521,7 +6521,6 @@ f    |27
 QUERY: ALTER TABLE f_star ADD COLUMN f int4;
 QUERY: UPDATE f_star SET f = 10;
 QUERY: ALTER TABLE e_star* ADD COLUMN e int4;
-
 QUERY: SELECT * FROM e_star*;
 class|aa|cc         | ee|e
 -----+--+-----------+---+-
@@ -6551,7 +6550,6 @@ f    |  |           |   |
 (23 rows)
 
 QUERY: ALTER TABLE a_star* ADD COLUMN a text;
-
 QUERY: SELECT class, aa, a FROM a_star*;
 class|aa|a
 -----+--+-
diff --git a/src/test/regress/queries.source b/src/test/regress/queries.source
index 07d1181c2e3..49e5bdc78aa 100644
--- a/src/test/regress/queries.source
+++ b/src/test/regress/queries.source
@@ -1,7 +1,7 @@
 --
 -- queries.source
 --
--- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.6 1996/12/02 14:17:59 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.7 1997/01/14 01:42:38 momjian Exp $
 --
 -- The comments that contain sequences of UNIX commands generate the 
 -- desired output for the POSTQUEL statement(s).
@@ -837,9 +837,9 @@ SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
 
 SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
 
-SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
+SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 = '0.0' ;
 
-SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ;
 
 SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;