Tweak new regression test case for more portability.

Ensure that same index gets selected on 32-bit and 64-bit machines.
Per buildfarm results.

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 3e2ab9ac5b852ba7f8988d0118bac6c1983d29ac..72986c78a2339eb827a994929db5e80d88e996aa 100644 (file)
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1266,19 +1266,19 @@ ORDER BY thousand, tenthous;
 (7 rows)
 
 explain (costs off)
-SELECT thousand, tenthous FROM tenk1
+SELECT thousand, tenthous, thousand+tenthous AS x FROM tenk1
 UNION ALL
-SELECT 42, 42 FROM tenk1
+SELECT 42, 42, hundred FROM tenk1
 ORDER BY thousand, tenthous;
-                              QUERY PLAN                               
------------------------------------------------------------------------
+                           QUERY PLAN                            
+-----------------------------------------------------------------
  Result
    ->  Merge Append
          Sort Key: public.tenk1.thousand, public.tenk1.tenthous
          ->  Index Only Scan using tenk1_thous_tenthous on tenk1
          ->  Sort
                Sort Key: (42), (42)
-               ->  Index Only Scan using tenk1_thous_tenthous on tenk1
+               ->  Index Only Scan using tenk1_hundred on tenk1
 (7 rows)
 
 explain (costs off)

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index 6e5a1d1c8eeaef0973ae213bffc8a064e5cf238b..deda5a519ef6d7b6f678bb7b952bfbd6478b2c96 100644 (file)
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -423,9 +423,9 @@ SELECT thousand, thousand FROM tenk1
 ORDER BY thousand, tenthous;
 
 explain (costs off)
-SELECT thousand, tenthous FROM tenk1
+SELECT thousand, tenthous, thousand+tenthous AS x FROM tenk1
 UNION ALL
-SELECT 42, 42 FROM tenk1
+SELECT 42, 42, hundred FROM tenk1
 ORDER BY thousand, tenthous;
 
 explain (costs off)