File postgresql-regress.patch of Package dba-postgresql-842

--- src/test/regress/expected/horology.out
+++ src/test/regress/expected/horology.out
@@ -601,26 +601,26 @@
 (1 row)
 
 -- timestamp with time zone, interval arithmetic around DST change
-SET TIME ZONE 'CST7CDT';
-SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
+SET TIME ZONE 'CST6CDT';
+SELECT timestamp with time zone '2005-04-02 12:00-06' + interval '1 day' as "Apr 3, 12:00";
          Apr 3, 12:00         
 ------------------------------
  Sun Apr 03 12:00:00 2005 CDT
 (1 row)
 
-SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '24 hours' as "Apr 3, 13:00";
+SELECT timestamp with time zone '2005-04-02 12:00-06' + interval '24 hours' as "Apr 3, 13:00";
          Apr 3, 13:00         
 ------------------------------
  Sun Apr 03 13:00:00 2005 CDT
 (1 row)
 
-SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '1 day' as "Apr 2, 12:00";
+SELECT timestamp with time zone '2005-04-03 12:00-05' - interval '1 day' as "Apr 2, 12:00";
          Apr 2, 12:00         
 ------------------------------
  Sat Apr 02 12:00:00 2005 CST
 (1 row)
 
-SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '24 hours' as "Apr 2, 11:00";
+SELECT timestamp with time zone '2005-04-03 12:00-05' - interval '24 hours' as "Apr 2, 11:00";
          Apr 2, 11:00         
 ------------------------------
  Sat Apr 02 11:00:00 2005 CST
--- src/test/regress/pg_regress.c
+++ src/test/regress/pg_regress.c
@@ -63,7 +63,7 @@
 
 /* currently we can use the same diff switches on all platforms */
 const char *basic_diff_opts = "-w";
-const char *pretty_diff_opts = "-w -C3";
+const char *pretty_diff_opts = "-w -U5";
 
 /* options settable from command line */
 _stringlist *dblist = NULL;
--- src/test/regress/sql/horology.sql
+++ src/test/regress/sql/horology.sql
@@ -113,11 +113,11 @@
 SELECT (timestamp with time zone 'tomorrow' > 'now') as "True";
 
 -- timestamp with time zone, interval arithmetic around DST change
-SET TIME ZONE 'CST7CDT';
-SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
-SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '24 hours' as "Apr 3, 13:00";
-SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '1 day' as "Apr 2, 12:00";
-SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '24 hours' as "Apr 2, 11:00";
+SET TIME ZONE 'CST6CDT';
+SELECT timestamp with time zone '2005-04-02 12:00-06' + interval '1 day' as "Apr 3, 12:00";
+SELECT timestamp with time zone '2005-04-02 12:00-06' + interval '24 hours' as "Apr 3, 13:00";
+SELECT timestamp with time zone '2005-04-03 12:00-05' - interval '1 day' as "Apr 2, 12:00";
+SELECT timestamp with time zone '2005-04-03 12:00-05' - interval '24 hours' as "Apr 2, 11:00";
 RESET TIME ZONE;