Modify expected output of tests due to recent changes

diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 1f7438651d4990aff4ca583a2ff9f5d7b94e5c80..8f01cf502b68a42e5eb39f87a1d99cf40765bb1d 100644 (file)
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2887,17 +2887,22 @@ SELECT * FROM tenk1
 EXPLAIN (NODES OFF, COSTS OFF)
 SELECT count(*) FROM tenk1
   WHERE hundred = 42 AND (thousand = 42 OR thousand = 99);
-                            QUERY PLAN                            
-------------------------------------------------------------------
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
  Aggregate
    ->  Remote Subquery Scan on all
          ->  Aggregate
                ->  Bitmap Heap Scan on tenk1
-                     Recheck Cond: (hundred = 42)
-                     Filter: ((thousand = 42) OR (thousand = 99))
-                     ->  Bitmap Index Scan on tenk1_hundred
-                           Index Cond: (hundred = 42)
-(8 rows)
+                     Recheck Cond: ((hundred = 42) AND ((thousand = 42) OR (thousand = 99)))
+                     ->  BitmapAnd
+                           ->  Bitmap Index Scan on tenk1_hundred
+                                 Index Cond: (hundred = 42)
+                           ->  BitmapOr
+                                 ->  Bitmap Index Scan on tenk1_thous_tenthous
+                                       Index Cond: (thousand = 42)
+                                 ->  Bitmap Index Scan on tenk1_thous_tenthous
+                                       Index Cond: (thousand = 99)
+(13 rows)
 
 SELECT count(*) FROM tenk1
   WHERE hundred = 42 AND (thousand = 42 OR thousand = 99);

diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index a430c92c99cbbe14e5e48ca9b225cae6ec7ba2bd..057ccb24a50d5c7ab3e3b5ae1fd75600f955920d 100644 (file)
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -166,7 +166,7 @@ SELECT relname, n_tup_ins, n_tup_upd, n_tup_del, n_live_tup, n_dead_tup
       relname      | n_tup_ins | n_tup_upd | n_tup_del | n_live_tup | n_dead_tup 
 -------------------+-----------+-----------+-----------+------------+------------
  trunc_stats_test  |         3 |         0 |         0 |          3 |          0
- trunc_stats_test1 |         3 |         0 |         0 |          3 |          0
+ trunc_stats_test1 |         3 |         0 |         1 |          2 |          1
  trunc_stats_test2 |         2 |         0 |         0 |          0 |          2
  trunc_stats_test3 |         2 |         0 |         0 |          0 |          2
  trunc_stats_test4 |         2 |         0 |         0 |          0 |          2