Accept some trivial regression diffs after the last merge

4 files changed, 47 insertions, 48 deletions

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index ea9f8f409b..1ba6f02c09 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -1078,9 +1078,10 @@ DETAIL:  The feature is not currently supported
 CREATE USER MAPPING FOR public SERVER s10 OPTIONS (user 'secret');
 ERROR:  Postgres-XL does not support USER MAPPING yet
 DETAIL:  The feature is not currently supported
-GRANT USAGE ON FOREIGN SERVER s10 TO regress_unprivileged_role;
-ERROR:  server "s10" does not exist
--- owner of server can see option fields
+CREATE USER MAPPING FOR regress_unprivileged_role SERVER s10 OPTIONS (user 'secret');
+ERROR:  Postgres-XL does not support USER MAPPING yet
+DETAIL:  The feature is not currently supported
+-- owner of server can see some option fields
 \deu+
       List of user mappings
  Server | User name | FDW options 
@@ -1107,6 +1108,7 @@ RESET ROLE;
 \set VERBOSITY terse
 DROP SERVER s10 CASCADE;
 ERROR:  server "s10" does not exist
+\set VERBOSITY default
 -- Triggers
 CREATE FUNCTION dummy_trigger() RETURNS TRIGGER AS $$
   BEGIN
@@ -1327,10 +1329,12 @@ Distribute By: HASH(c1)
 Location Nodes: ALL DATANODES
 
 \d+ ft2
+\set VERBOSITY terse
 DROP FOREIGN TABLE ft2; -- ERROR
 ERROR:  foreign table "ft2" does not exist
 DROP FOREIGN TABLE ft2 CASCADE;
 ERROR:  foreign table "ft2" does not exist
+\set VERBOSITY default
 CREATE FOREIGN TABLE ft2 (
 	c1 integer NOT NULL,
 	c2 text,
@@ -1621,14 +1625,12 @@ DROP SERVER t1 CASCADE;
 ERROR:  server "t1" does not exist
 DROP USER MAPPING FOR regress_test_role SERVER s6;
 ERROR:  role "regress_test_role" does not exist
--- This test causes some order dependent cascade detail output,
--- so switch to terse mode for it.
 \set VERBOSITY terse
 DROP FOREIGN DATA WRAPPER foo CASCADE;
 ERROR:  foreign-data wrapper "foo" does not exist
-\set VERBOSITY default
 DROP SERVER s8 CASCADE;
 ERROR:  server "s8" does not exist
+\set VERBOSITY default
 DROP ROLE regress_test_indirect;
 ERROR:  role "regress_test_indirect" does not exist
 DROP ROLE regress_test_role;
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index ac22573495..77ad5c75a0 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -1238,6 +1238,12 @@ DETAIL:  The feature is not currently supported
 SELECT lo_create(2002);
 ERROR:  Postgres-XL does not yet support large objects
 DETAIL:  The feature is not currently supported
+SELECT loread(lo_open(1001, x'20000'::int), 32);	-- allowed, for now
+ERROR:  Postgres-XL does not yet support large objects
+DETAIL:  The feature is not currently supported
+SELECT lowrite(lo_open(1001, x'40000'::int), 'abcd');	-- fail, wrong mode
+ERROR:  Postgres-XL does not yet support large objects
+DETAIL:  The feature is not currently supported
 SELECT loread(lo_open(1001, x'40000'::int), 32);
 ERROR:  Postgres-XL does not yet support large objects
 DETAIL:  The feature is not currently supported
@@ -1312,6 +1318,9 @@ DETAIL:  The feature is not currently supported
 SELECT lo_truncate(lo_open(1002, x'20000'::int), 10);	-- to be denied
 ERROR:  Postgres-XL does not yet support large objects
 DETAIL:  The feature is not currently supported
+SELECT lo_put(1002, 1, 'abcd');				-- to be denied
+ERROR:  Postgres-XL does not yet support large objects
+DETAIL:  The feature is not currently supported
 SELECT lo_unlink(1002);					-- to be denied
 ERROR:  Postgres-XL does not yet support large objects
 DETAIL:  The feature is not currently supported
diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index 981e2e397a..6f34ff3e46 100644
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -79,12 +79,6 @@ Distribute By: HASH(id)
 Location Nodes: ALL DATANODES
 
 \dRp+ testpub_foralltables
-                  Publication testpub_foralltables
-          Owner           | All tables | Inserts | Updates | Deletes 
---------------------------+------------+---------+---------+---------
- regress_publication_user | t          | t       | t       | f
-(1 row)
-
 DROP TABLE testpub_tbl2;
 DROP PUBLICATION testpub_foralltables;
 ERROR:  publication "testpub_foralltables" does not exist
@@ -151,14 +145,6 @@ Distribute By: HASH(id)
 Location Nodes: ALL DATANODES
 
 \dRp+ testpub_default
-                     Publication testpub_default
-          Owner           | All tables | Inserts | Updates | Deletes 
---------------------------+------------+---------+---------+---------
- regress_publication_user | f          | t       | t       | t
-Tables:
-    "pub_test.testpub_nopk"
-    "public.testpub_tbl1"
-
 ALTER PUBLICATION testpub_default DROP TABLE testpub_tbl1, pub_test.testpub_nopk;
 ERROR:  publication "testpub_default" does not exist
 -- fail - nonexistent
@@ -201,12 +187,6 @@ DROP TABLE testpub_parted;
 DROP VIEW testpub_view;
 DROP TABLE testpub_tbl1;
 \dRp+ testpub_default
-                     Publication testpub_default
-          Owner           | All tables | Inserts | Updates | Deletes 
---------------------------+------------+---------+---------+---------
- regress_publication_user | f          | t       | t       | t
-(1 row)
-
 -- fail - must be owner of publication
 SET ROLE regress_publication_user_dummy;
 ALTER PUBLICATION testpub_default RENAME TO testpub_dummy;
diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index 715a23bef4..4b4d95d432 100644
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -353,17 +353,19 @@ set enable_hashagg to on;
 explain (costs off)
 select count(*) from
   ( select unique1 from tenk1 intersect select fivethous from tenk1 ) ss;
-                                     QUERY PLAN                                     
-------------------------------------------------------------------------------------
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
  Aggregate
    ->  Subquery Scan on ss
          ->  HashSetOp Intersect
                ->  Append
                      ->  Subquery Scan on "*SELECT* 2"
-                           ->  Seq Scan on tenk1
+                           ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                                 ->  Seq Scan on tenk1
                      ->  Subquery Scan on "*SELECT* 1"
-                           ->  Index Only Scan using tenk1_unique1 on tenk1 tenk1_1
-(8 rows)
+                           ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                                 ->  Index Only Scan using tenk1_unique1 on tenk1 tenk1_1
+(10 rows)
 
 select count(*) from
   ( select unique1 from tenk1 intersect select fivethous from tenk1 ) ss;
@@ -374,16 +376,18 @@ select count(*) from
 
 explain (costs off)
 select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10;
-                               QUERY PLAN                               
-------------------------------------------------------------------------
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
  HashSetOp Except
    ->  Append
          ->  Subquery Scan on "*SELECT* 1"
-               ->  Index Only Scan using tenk1_unique1 on tenk1
+               ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                     ->  Index Only Scan using tenk1_unique1 on tenk1
          ->  Subquery Scan on "*SELECT* 2"
-               ->  Index Only Scan using tenk1_unique2 on tenk1 tenk1_1
-                     Filter: (unique2 <> 10)
-(7 rows)
+               ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                     ->  Index Only Scan using tenk1_unique2 on tenk1 tenk1_1
+                           Filter: (unique2 <> 10)
+(9 rows)
 
 select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10;
  unique1 
@@ -395,8 +399,8 @@ set enable_hashagg to off;
 explain (costs off)
 select count(*) from
   ( select unique1 from tenk1 intersect select fivethous from tenk1 ) ss;
-                                        QUERY PLAN                                        
-------------------------------------------------------------------------------------------
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
  Aggregate
    ->  Subquery Scan on ss
          ->  SetOp Intersect
@@ -404,10 +408,12 @@ select count(*) from
                      Sort Key: "*SELECT* 2".fivethous
                      ->  Append
                            ->  Subquery Scan on "*SELECT* 2"
-                                 ->  Seq Scan on tenk1
+                                 ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                                       ->  Seq Scan on tenk1
                            ->  Subquery Scan on "*SELECT* 1"
-                                 ->  Index Only Scan using tenk1_unique1 on tenk1 tenk1_1
-(10 rows)
+                                 ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                                       ->  Index Only Scan using tenk1_unique1 on tenk1 tenk1_1
+(12 rows)
 
 select count(*) from
   ( select unique1 from tenk1 intersect select fivethous from tenk1 ) ss;
@@ -418,18 +424,20 @@ select count(*) from
 
 explain (costs off)
 select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10;
-                                  QUERY PLAN                                  
-------------------------------------------------------------------------------
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
  SetOp Except
    ->  Sort
          Sort Key: "*SELECT* 1".unique1
          ->  Append
                ->  Subquery Scan on "*SELECT* 1"
-                     ->  Index Only Scan using tenk1_unique1 on tenk1
+                     ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                           ->  Index Only Scan using tenk1_unique1 on tenk1
                ->  Subquery Scan on "*SELECT* 2"
-                     ->  Index Only Scan using tenk1_unique2 on tenk1 tenk1_1
-                           Filter: (unique2 <> 10)
-(9 rows)
+                     ->  Remote Subquery Scan on all (datanode_1,datanode_2)
+                           ->  Index Only Scan using tenk1_unique2 on tenk1 tenk1_1
+                                 Filter: (unique2 <> 10)
+(11 rows)
 
 select unique1 from tenk1 except select unique2 from tenk1 where unique2 != 10;
  unique1