*** /Users/smagen/projects/postgresql/postgresql/src/test/regress/expected/insert_conflict.out	2015-10-16 17:47:37.000000000 +0300
--- /Users/smagen/projects/postgresql/postgresql/src/test/regress/results/insert_conflict.out	2015-10-16 18:29:12.000000000 +0300
***************
*** 53,63 ****
     Conflict Filter: (alternatives: SubPlan 1 or hashed SubPlan 2)
     ->  Result
     SubPlan 1
!      ->  Index Only Scan using both_index_expr_key on insertconflicttest ii
!            Index Cond: (key = excluded.key)
     SubPlan 2
       ->  Seq Scan on insertconflicttest ii_1
! (10 rows)
  
  -- Neither collation nor operator class specifications are required --
  -- supplying them merely *limits* matches to indexes with matching opclasses
--- 53,65 ----
     Conflict Filter: (alternatives: SubPlan 1 or hashed SubPlan 2)
     ->  Result
     SubPlan 1
!      ->  Bitmap Heap Scan on insertconflicttest ii
!            Recheck Cond: (key = excluded.key)
!            ->  Bitmap Index Scan on both_index_expr_key
!                  Index Cond: (key = excluded.key)
     SubPlan 2
       ->  Seq Scan on insertconflicttest ii_1
! (12 rows)
  
  -- Neither collation nor operator class specifications are required --
  -- supplying them merely *limits* matches to indexes with matching opclasses

======================================================================

*** /Users/smagen/projects/postgresql/postgresql/src/test/regress/expected/rowsecurity.out	2015-10-16 17:47:37.000000000 +0300
--- /Users/smagen/projects/postgresql/postgresql/src/test/regress/results/rowsecurity.out	2015-10-16 18:29:21.000000000 +0300
***************
*** 902,909 ****
  (3 rows)
  
  EXPLAIN (COSTS OFF) SELECT (SELECT x FROM s1 LIMIT 1) xx, * FROM s2 WHERE y like '%28%';
!                              QUERY PLAN                             
! --------------------------------------------------------------------
   Subquery Scan on s2
     Filter: (s2.y ~~ '%28%'::text)
     ->  Seq Scan on s2 s2_1
--- 902,909 ----
  (3 rows)
  
  EXPLAIN (COSTS OFF) SELECT (SELECT x FROM s1 LIMIT 1) xx, * FROM s2 WHERE y like '%28%';
!                                 QUERY PLAN                                
! --------------------------------------------------------------------------
   Subquery Scan on s2
     Filter: (s2.y ~~ '%28%'::text)
     ->  Seq Scan on s2 s2_1
***************
*** 911,925 ****
     SubPlan 1
       ->  Limit
             ->  Subquery Scan on s1
!                  ->  Nested Loop Semi Join
!                        Join Filter: (s1_1.a = s2_2.x)
                         ->  Seq Scan on s1 s1_1
!                        ->  Materialize
!                              ->  Subquery Scan on s2_2
!                                    Filter: (s2_2.y ~~ '%af%'::text)
!                                    ->  Seq Scan on s2 s2_3
!                                          Filter: ((x % 2) = 0)
! (15 rows)
  
  SET SESSION AUTHORIZATION rls_regress_user0;
  ALTER POLICY p2 ON s2 USING (x in (select a from s1 where b like '%d2%'));
--- 911,927 ----
     SubPlan 1
       ->  Limit
             ->  Subquery Scan on s1
!                  ->  Hash Join
!                        Hash Cond: (s1_1.a = s2_2.x)
                         ->  Seq Scan on s1 s1_1
!                        ->  Hash
!                              ->  HashAggregate
!                                    Group Key: s2_2.x
!                                    ->  Subquery Scan on s2_2
!                                          Filter: (s2_2.y ~~ '%af%'::text)
!                                          ->  Seq Scan on s2 s2_3
!                                                Filter: ((x % 2) = 0)
! (17 rows)
  
  SET SESSION AUTHORIZATION rls_regress_user0;
  ALTER POLICY p2 ON s2 USING (x in (select a from s1 where b like '%d2%'));

======================================================================