*** /home/postgres/pgsql/src/test/regress/expected/rowsecurity.out	Sat Dec 19 16:47:11 2015
--- /home/postgres/pgsql/src/test/regress/results/rowsecurity.out	Sun Jan  3 21:56:18 2016
***************
*** 3217,3244 ****
  SET row_security = off;
  -- Shows all rows
  TABLE r1;
!  a  
! ----
!  10
!  20
! (2 rows)
! 
  -- Update all rows
  UPDATE r1 SET a = 1;
  TABLE r1;
!  a 
! ---
!  1
!  1
! (2 rows)
! 
  -- Delete all rows
  DELETE FROM r1;
  TABLE r1;
!  a 
! ---
! (0 rows)
! 
  DROP TABLE r1;
  --
  -- FORCE ROW LEVEL SECURITY does not break RI
--- 3217,3233 ----
  SET row_security = off;
  -- Shows all rows
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  -- Update all rows
  UPDATE r1 SET a = 1;
+ ERROR:  insufficient privilege to bypass row-level security
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  -- Delete all rows
  DELETE FROM r1;
+ ERROR:  insufficient privilege to bypass row-level security
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  DROP TABLE r1;
  --
  -- FORCE ROW LEVEL SECURITY does not break RI
***************
*** 3351,3362 ****
  SET row_security = off;
  -- Rows shown now
  TABLE r1;
!  a  
! ----
!  10
!  20
! (2 rows)
! 
  SET row_security = on;
  -- Error
  INSERT INTO r1 VALUES (10), (20) RETURNING *;
--- 3340,3346 ----
  SET row_security = off;
  -- Rows shown now
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  SET row_security = on;
  -- Error
  INSERT INTO r1 VALUES (10), (20) RETURNING *;
***************
*** 3379,3402 ****
  -- Show updated rows
  SET row_security = off;
  TABLE r1;
!  a  
! ----
!  30
! (1 row)
! 
  -- reset value in r1 for test with RETURNING
  UPDATE r1 SET a = 10;
  -- Verify row reset
  TABLE r1;
!  a  
! ----
!  10
! (1 row)
! 
  SET row_security = on;
  -- Error
  UPDATE r1 SET a = 30 RETURNING *;
! ERROR:  new row violates row-level security policy for table "r1"
  DROP TABLE r1;
  -- Check dependency handling
  RESET SESSION AUTHORIZATION;
--- 3363,3382 ----
  -- Show updated rows
  SET row_security = off;
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  -- reset value in r1 for test with RETURNING
  UPDATE r1 SET a = 10;
+ ERROR:  insufficient privilege to bypass row-level security
  -- Verify row reset
  TABLE r1;
! ERROR:  insufficient privilege to bypass row-level security
  SET row_security = on;
  -- Error
  UPDATE r1 SET a = 30 RETURNING *;
!  a 
! ---
! (0 rows)
! 
  DROP TABLE r1;
  -- Check dependency handling
  RESET SESSION AUTHORIZATION;

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