This is an automated email from the ASF dual-hosted git repository.

chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git


The following commit(s) were added to refs/heads/cbdb-postgres-merge by this 
push:
     new 46ef02bd79a Fix some answer files
46ef02bd79a is described below

commit 46ef02bd79ac6331151bc490a8d290dae15256a2
Author: Jinbao Chen <[email protected]>
AuthorDate: Thu Nov 27 19:32:33 2025 +0800

    Fix some answer files
---
 src/test/regress/expected/bitmapops.out    | 40 +++++++-------
 src/test/regress/expected/foreign_data.out | 72 +++++++------------------
 src/test/regress/expected/guc.out          | 87 +++++++++++++++++++++++++-----
 src/test/regress/expected/tsearch.out      |  3 --
 src/test/regress/serial_schedule           | 22 ++++----
 src/test/regress/sql/cluster.sql           |  8 ---
 src/test/regress/sql/foreign_data.sql      |  8 +--
 src/test/regress/sql/guc.sql               |  4 +-
 src/test/regress/sql/tsearch.sql           |  3 --
 9 files changed, 125 insertions(+), 122 deletions(-)

diff --git a/src/test/regress/expected/bitmapops.out 
b/src/test/regress/expected/bitmapops.out
index d6428387e0e..a3d5147b372 100644
--- a/src/test/regress/expected/bitmapops.out
+++ b/src/test/regress/expected/bitmapops.out
@@ -149,18 +149,18 @@ SELECT count(*) FROM bmscantest_ao WHERE a = 1 AND b = 1 
AND c = 1;
 EXPLAIN SELECT count(*) FROM bmscantest_ao WHERE a = 1 AND (b = 1 OR c = 1) 
AND d = 1;
                                                  QUERY PLAN                    
                              
 
-------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=74.60..74.61 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=74.54..74.59 rows=3 
width=8)
-         ->  Partial Aggregate  (cost=74.54..74.55 rows=1 width=8)
-               ->  Bitmap Heap Scan on bmscantest_ao  (cost=70.47..74.49 
rows=18 width=0)
-                     Recheck Cond: ((d = 1) AND (a = 1) AND ((b = 1) OR (c = 
1)))
-                     ->  BitmapAnd  (cost=70.47..70.47 rows=1 width=0)
+ Finalize Aggregate  (cost=47.80..47.81 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=47.74..47.79 rows=3 
width=8)
+         ->  Partial Aggregate  (cost=47.74..47.75 rows=1 width=8)
+               ->  Bitmap Heap Scan on bmscantest_ao  (cost=43.68..47.70 
rows=18 width=0)
+                     Recheck Cond: ((a = 1) AND (d = 1) AND ((b = 1) OR (c = 
1)))
+                     ->  BitmapAnd  (cost=43.68..43.68 rows=1 width=0)
+                           ->  Bitmap Index Scan on i_bmtest_ao_a  
(cost=0.00..4.01 rows=440 width=0)
+                                 Index Cond: (a = 1)
                            ->  Bitmap Index Scan on i_bmtest_ao_d  
(cost=0.00..17.07 rows=396 width=0)
                                  Index Cond: (d = 1)
-                           ->  Bitmap Index Scan on i_bmtest_ao_a  
(cost=0.00..17.91 rows=440 width=0)
-                                 Index Cond: (a = 1)
-                           ->  BitmapOr  (cost=34.99..34.99 rows=836 width=0)
-                                 ->  Bitmap Index Scan on i_bmtest_ao_b  
(cost=0.00..16.90 rows=396 width=0)
+                           ->  BitmapOr  (cost=22.09..22.09 rows=836 width=0)
+                                 ->  Bitmap Index Scan on i_bmtest_ao_b  
(cost=0.00..4.01 rows=396 width=0)
                                        Index Cond: (b = 1)
                                  ->  Bitmap Index Scan on i_bmtest_ao_c  
(cost=0.00..18.07 rows=440 width=0)
                                        Index Cond: (c = 1)
@@ -263,18 +263,18 @@ SELECT count(*) FROM bmscantest_aocs WHERE a = 1 AND b = 
1 AND c = 1;
 EXPLAIN SELECT count(*) FROM bmscantest_aocs WHERE a = 1 AND (b = 1 OR c = 1) 
AND d = 1;
                                                   QUERY PLAN                   
                                
 
---------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=74.60..74.61 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=74.54..74.59 rows=3 
width=8)
-         ->  Partial Aggregate  (cost=74.54..74.55 rows=1 width=8)
-               ->  Bitmap Heap Scan on bmscantest_aocs  (cost=70.47..74.49 
rows=18 width=0)
-                     Recheck Cond: ((d = 1) AND (a = 1) AND ((b = 1) OR (c = 
1)))
-                     ->  BitmapAnd  (cost=70.47..70.47 rows=1 width=0)
+ Finalize Aggregate  (cost=47.80..47.81 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=47.74..47.79 rows=3 
width=8)
+         ->  Partial Aggregate  (cost=47.74..47.75 rows=1 width=8)
+               ->  Bitmap Heap Scan on bmscantest_aocs  (cost=43.68..47.70 
rows=18 width=0)
+                     Recheck Cond: ((a = 1) AND (d = 1) AND ((b = 1) OR (c = 
1)))
+                     ->  BitmapAnd  (cost=43.68..43.68 rows=1 width=0)
+                           ->  Bitmap Index Scan on i_bmtest_aocs_a  
(cost=0.00..4.01 rows=440 width=0)
+                                 Index Cond: (a = 1)
                            ->  Bitmap Index Scan on i_bmtest_aocs_d  
(cost=0.00..17.07 rows=396 width=0)
                                  Index Cond: (d = 1)
-                           ->  Bitmap Index Scan on i_bmtest_aocs_a  
(cost=0.00..17.91 rows=440 width=0)
-                                 Index Cond: (a = 1)
-                           ->  BitmapOr  (cost=34.99..34.99 rows=836 width=0)
-                                 ->  Bitmap Index Scan on i_bmtest_aocs_b  
(cost=0.00..16.90 rows=396 width=0)
+                           ->  BitmapOr  (cost=22.09..22.09 rows=836 width=0)
+                                 ->  Bitmap Index Scan on i_bmtest_aocs_b  
(cost=0.00..4.01 rows=396 width=0)
                                        Index Cond: (b = 1)
                                  ->  Bitmap Index Scan on i_bmtest_aocs_c  
(cost=0.00..18.07 rows=440 width=0)
                                        Index Cond: (c = 1)
diff --git a/src/test/regress/expected/foreign_data.out 
b/src/test/regress/expected/foreign_data.out
index bd4db113ded..c112a29311a 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -1,7 +1,6 @@
 --
 -- Test foreign-data wrapper and server management.
 --
-<<<<<<< HEAD
 -- In GPDB, there are a couple of special built-in objects, to handle
 -- backwards-compatibility with external tables. They are the FDW called
 -- 'gp_exttable_fdw', foreign server 'gp_exttable_server'. We don't want those
@@ -16,7 +15,6 @@
 -- but 'g' (the 2nd rule is needed to include the 'postgresql' FDW used in the
 -- test).
 \set NO_BUILTINS ([a-fh-z]?*)|(g[a-oq-z]?*)
-=======
 -- directory paths and dlsuffix are passed to us in environment variables
 \getenv libdir PG_LIBDIR
 \getenv dlsuffix PG_DLSUFFIX
@@ -25,7 +23,6 @@ CREATE FUNCTION test_fdw_handler()
     RETURNS fdw_handler
     AS :'regresslib', 'test_fdw_handler'
     LANGUAGE C;
->>>>>>> REL_16_9
 -- Clean up in case a prior regression run failed
 -- Suppress NOTICE messages when roles don't exist
 SET client_min_messages TO 'warning';
@@ -913,30 +910,24 @@ ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
 ERROR:  relation "ft1" does not exist
-<<<<<<< HEAD
-ALTER FOREIGN TABLE foreign_schema.ft1 SET TABLESPACE ts;       -- ERROR
-ERROR:  "ft1" is not a table, materialized view, index, or partitioned index
-=======
 ALTER SEQUENCE foreign_schema.ft1_c11_seq SET SCHEMA public;    -- ERROR
-ERROR:  cannot move an owned sequence into another schema
-DETAIL:  Sequence "ft1_c11_seq" is linked to table "ft1".
->>>>>>> REL_16_9
+ERROR:  relation "foreign_schema.ft1_c11_seq" does not exist
 ALTER FOREIGN TABLE foreign_schema.ft1 RENAME c1 TO foreign_column_1;
 ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1;
 \d foreign_schema.foreign_table_1
-                                            Foreign table 
"foreign_schema.foreign_table_1"
-      Column      |  Type   | Collation | Nullable |                     
Default                     |          FDW options           
-------------------+---------+-----------+----------+-------------------------------------------------+--------------------------------
- foreign_column_1 | integer |           | not null |                           
                      | ("param 1" 'val1')
- c2               | text    |           |          |                           
                      | (param2 'val2', param3 'val3')
- c3               | date    |           |          |                           
                      | 
- c4               | integer |           |          | 0                         
                      | 
- c5               | integer |           |          |                           
                      | 
- c6               | integer |           | not null |                           
                      | 
- c7               | integer |           |          |                           
                      | (p1 'v1', p2 'v2')
- c8               | text    |           |          |                           
                      | (p2 'V2')
- c10              | integer |           |          |                           
                      | (p1 'v1')
- c11              | integer |           | not null | 
nextval('foreign_schema.ft1_c11_seq'::regclass) | 
+                                    Foreign table 
"foreign_schema.foreign_table_1"
+      Column      |  Type   | Collation | Nullable |             Default       
       |          FDW options           
+------------------+---------+-----------+----------+----------------------------------+--------------------------------
+ foreign_column_1 | integer |           | not null |                           
       | ("param 1" 'val1')
+ c2               | text    |           |          |                           
       | (param2 'val2', param3 'val3')
+ c3               | date    |           |          |                           
       | 
+ c4               | integer |           |          | 0                         
       | 
+ c5               | integer |           |          |                           
       | 
+ c6               | integer |           | not null |                           
       | 
+ c7               | integer |           |          |                           
       | (p1 'v1', p2 'v2')
+ c8               | text    |           |          |                           
       | (p2 'V2')
+ c10              | integer |           |          |                           
       | (p1 'v1')
+ c11              | integer |           | not null | 
nextval('ft1_c11_seq'::regclass) | 
 Check constraints:
     "ft1_c2_check" CHECK (c2 <> ''::text)
     "ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= 
'01-31-1994'::date)
@@ -1518,12 +1509,7 @@ NOTICE:  merging column "c3" with inherited definition
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 Inherits: fd_pt1
-<<<<<<< HEAD
-Child tables: ft3
-=======
-Child tables: ct3,
-              ft3, FOREIGN
->>>>>>> REL_16_9
+Child tables: ft3, FOREIGN
 
 -- start_ignore
 -- GPDB: ct3 is not created.
@@ -1574,12 +1560,7 @@ Child tables: ft2, FOREIGN
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 Inherits: fd_pt1
-<<<<<<< HEAD
-Child tables: ft3
-=======
-Child tables: ct3,
-              ft3, FOREIGN
->>>>>>> REL_16_9
+Child tables: ft3, FOREIGN
 
 -- start_ignore
 -- GPDB: ct3 is not created.
@@ -1642,12 +1623,7 @@ Child tables: ft2, FOREIGN
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 Inherits: fd_pt1
-<<<<<<< HEAD
-Child tables: ft3
-=======
-Child tables: ct3,
-              ft3, FOREIGN
->>>>>>> REL_16_9
+Child tables: ft3, FOREIGN
 
 -- drop attributes recursively
 ALTER TABLE fd_pt1 DROP COLUMN c4;
@@ -1674,12 +1650,7 @@ Child tables: ft2, FOREIGN
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 Inherits: fd_pt1
-<<<<<<< HEAD
-Child tables: ft3
-=======
-Child tables: ct3,
-              ft3, FOREIGN
->>>>>>> REL_16_9
+Child tables: ft3, FOREIGN
 
 -- add constraints recursively
 ALTER TABLE fd_pt1 ADD CONSTRAINT fd_pt1chk1 CHECK (c1 > 0) NO INHERIT;
@@ -1720,12 +1691,7 @@ Check constraints:
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 Inherits: fd_pt1
-<<<<<<< HEAD
-Child tables: ft3
-=======
-Child tables: ct3,
-              ft3, FOREIGN
->>>>>>> REL_16_9
+Child tables: ft3, FOREIGN
 
 DROP FOREIGN TABLE ft2; -- ERROR
 ERROR:  cannot drop foreign table ft2 because other objects depend on it
diff --git a/src/test/regress/expected/guc.out 
b/src/test/regress/expected/guc.out
index 35bf469677b..dcc5e95f13e 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -826,7 +826,6 @@ set default_with_oids to f;
 -- Should not allow to set it to true.
 set default_with_oids to t;
 ERROR:  tables declared WITH OIDS are not supported
-<<<<<<< HEAD
 SET "request.header.user.agent" = 'curl/7.29.0';
 SHOW "request.header.user.agent";
  request.header.user.agent 
@@ -858,12 +857,12 @@ NOTICE:  table "t1" does not exist, skipping
 
 -- After funtion drop table, public schema is still in search_path
 create table public.t1(i ty1);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, and no column type is 
suitable for a distribution key. Creating a NULL policy entry.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' 
as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make 
sure column(s) chosen are the optimal data distribution key to minimize skew.
 drop table public.t1;
 drop type public.ty1;
 drop function n1.drop_table(v_schema character varying, v_table character 
varying);
 drop schema n1;
-=======
 -- Test GUC categories and flag patterns
 SELECT pg_settings_get_flags(NULL);
  pg_settings_get_flags 
@@ -889,19 +888,79 @@ CREATE TABLE tab_settings_flags AS SELECT name, category,
 SELECT name FROM tab_settings_flags
   WHERE category = 'Developer Options' AND NOT not_in_sample
   ORDER BY 1;
- name 
-------
-(0 rows)
+                   name                    
+-------------------------------------------
+ allow_dml_directory_table
+ aqumv_allow_foreign_table
+ create_restartpoint_on_ckpt_record_replay
+ enable_parallel_dedup_semi_join
+ enable_parallel_dedup_semi_reverse_join
+ enable_parallel_semi_join
+ gp_appendonly_compaction_segfile_limit
+ gp_appendonly_insert_files
+ gp_appendonly_insert_files_tuples_range
+ gp_autostats_allow_nonowner
+ gp_autostats_lock_wait
+ gp_autostats_mode
+ gp_autostats_mode_in_functions
+ gp_autostats_on_change_threshold
+ gp_enable_runtime_filter_pushdown
+ gp_reraise_signal
+ optimizer_control
+ optimizer_enable_orderedagg
+(18 rows)
 
 -- Most query-tuning GUCs are flagged as valid for EXPLAIN.
 -- default_statistics_target is an exception.
 SELECT name FROM tab_settings_flags
   WHERE category ~ '^Query Tuning' AND NOT explain
   ORDER BY 1;
-           name            
----------------------------
- default_statistics_target
-(1 row)
+                         name                         
+------------------------------------------------------
+ enable_groupagg
+ gp_adjust_selectivity_for_outerjoins
+ gp_dynamic_partition_pruning
+ gp_enable_agg_distinct
+ gp_enable_agg_distinct_pruning
+ gp_enable_agg_pushdown
+ gp_enable_ao_indexscan
+ gp_enable_direct_dispatch
+ gp_enable_fast_sri
+ gp_enable_minmax_optimization
+ gp_enable_multiphase_agg
+ gp_enable_multiphase_limit
+ gp_enable_predicate_propagation
+ gp_enable_preunique
+ gp_enable_refresh_fast_path
+ gp_enable_relsize_collection
+ gp_enable_runtime_filter
+ gp_enable_sort_limit
+ gp_motion_cost_per_row
+ gp_segments_for_planner
+ gp_statistics_pullup_from_child_partition
+ gp_statistics_use_fkeys
+ optimizer
+ optimizer_array_expansion_threshold
+ optimizer_cte_inlining_bound
+ optimizer_damping_factor_filter
+ optimizer_damping_factor_groupby
+ optimizer_damping_factor_join
+ optimizer_dpe_stats
+ optimizer_enable_associativity
+ optimizer_enable_dynamicbitmapscan
+ optimizer_enable_dynamicindexonlyscan
+ optimizer_enable_dynamicindexscan
+ optimizer_enable_right_outer_join
+ optimizer_force_three_stage_scalar_dqa
+ optimizer_join_arity_for_associativity_commutativity
+ optimizer_join_order
+ optimizer_join_order_threshold
+ optimizer_metadata_caching
+ optimizer_nestloop_factor
+ optimizer_penalize_broadcast_threshold
+ optimizer_push_group_by_below_setop_threshold
+ optimizer_sort_factor
+(43 rows)
 
 -- Runtime-computed GUCs should be part of the preset category.
 SELECT name FROM tab_settings_flags
@@ -915,9 +974,10 @@ SELECT name FROM tab_settings_flags
 SELECT name FROM tab_settings_flags
   WHERE category = 'Preset Options' AND NOT not_in_sample
   ORDER BY 1;
- name 
-------
-(0 rows)
+          name          
+------------------------
+ gp_max_partition_level
+(1 row)
 
 -- NO_RESET implies NO_RESET_ALL.
 SELECT name FROM tab_settings_flags
@@ -928,4 +988,3 @@ SELECT name FROM tab_settings_flags
 (0 rows)
 
 DROP TABLE tab_settings_flags;
->>>>>>> REL_16_9
diff --git a/src/test/regress/expected/tsearch.out 
b/src/test/regress/expected/tsearch.out
index dd7c20231a7..944020de239 100644
--- a/src/test/regress/expected/tsearch.out
+++ b/src/test/regress/expected/tsearch.out
@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 set optimizer_print_missing_stats = off;
-=======
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
->>>>>>> REL_16_9
 --
 -- Sanity checks for text search catalogs
 --
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 61db0804151..4446c1b9ebd 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -148,18 +148,18 @@ test: collate.linux.utf8
 # test: write_parallel
 test: publication
 test: subscription
-# test: select_views
-# test: portals_p2
+test: select_views
+test: portals_p2
 # #test: foreign_key
-# test: cluster
-# test: dependency
-# test: guc
-# test: bitmapops
-# test: combocid
-# test: tsearch
-# test: tsdicts
-# test: foreign_data
-# test: gp_foreign_data
+test: cluster
+test: dependency
+test: guc
+test: bitmapops
+test: combocid
+test: tsearch
+test: tsdicts
+test: foreign_data
+test: gp_foreign_data
 # test: window
 # test: xmlmap
 # test: functional_deps
diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index d5b348fd4aa..7cec728ffb2 100644
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -294,11 +294,7 @@ COMMIT;
 -- and after clustering on clstr_expression_minus_a
 CLUSTER clstr_expression USING clstr_expression_minus_a;
 WITH rows AS
-<<<<<<< HEAD
   (SELECT ctid, lag(a) OVER (PARTITION BY gp_segment_id ORDER BY ctid) AS la, 
a FROM clstr_expression)
-=======
-  (SELECT ctid, lag(a) OVER (ORDER BY ctid) AS la, a FROM clstr_expression)
->>>>>>> REL_16_9
 SELECT * FROM rows WHERE la < a;
 BEGIN;
 SET LOCAL enable_seqscan = false;
@@ -311,11 +307,7 @@ COMMIT;
 -- and after clustering on clstr_expression_upper_b
 CLUSTER clstr_expression USING clstr_expression_upper_b;
 WITH rows AS
-<<<<<<< HEAD
   (SELECT ctid, lag(b) OVER (PARTITION BY gp_segment_id ORDER BY ctid) AS lb, 
b FROM clstr_expression)
-=======
-  (SELECT ctid, lag(b) OVER (ORDER BY ctid) AS lb, b FROM clstr_expression)
->>>>>>> REL_16_9
 SELECT * FROM rows WHERE upper(lb) > upper(b);
 BEGIN;
 SET LOCAL enable_seqscan = false;
diff --git a/src/test/regress/sql/foreign_data.sql 
b/src/test/regress/sql/foreign_data.sql
index f942945122d..f39bfbe6417 100644
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -2,7 +2,6 @@
 -- Test foreign-data wrapper and server management.
 --
 
-<<<<<<< HEAD
 -- In GPDB, there are a couple of special built-in objects, to handle
 -- backwards-compatibility with external tables. They are the FDW called
 -- 'gp_exttable_fdw', foreign server 'gp_exttable_server'. We don't want those
@@ -17,7 +16,7 @@
 -- but 'g' (the 2nd rule is needed to include the 'postgresql' FDW used in the
 -- test).
 \set NO_BUILTINS ([a-fh-z]?*)|(g[a-oq-z]?*)
-=======
+
 -- directory paths and dlsuffix are passed to us in environment variables
 \getenv libdir PG_LIBDIR
 \getenv dlsuffix PG_DLSUFFIX
@@ -29,7 +28,6 @@ CREATE FUNCTION test_fdw_handler()
     AS :'regresslib', 'test_fdw_handler'
     LANGUAGE C;
 
->>>>>>> REL_16_9
 -- Clean up in case a prior regression run failed
 
 -- Suppress NOTICE messages when roles don't exist
@@ -439,11 +437,7 @@ ALTER FOREIGN TABLE ft1 DROP COLUMN c9;
 ALTER FOREIGN TABLE ft1 ADD COLUMN c11 serial;
 ALTER FOREIGN TABLE ft1 SET SCHEMA foreign_schema;
 ALTER FOREIGN TABLE ft1 SET TABLESPACE ts;                      -- ERROR
-<<<<<<< HEAD
-ALTER FOREIGN TABLE foreign_schema.ft1 SET TABLESPACE ts;       -- ERROR
-=======
 ALTER SEQUENCE foreign_schema.ft1_c11_seq SET SCHEMA public;    -- ERROR
->>>>>>> REL_16_9
 ALTER FOREIGN TABLE foreign_schema.ft1 RENAME c1 TO foreign_column_1;
 ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1;
 \d foreign_schema.foreign_table_1
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index 03a52899337..1069a4562cd 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -319,7 +319,6 @@ set default_with_oids to f;
 -- Should not allow to set it to true.
 set default_with_oids to t;
 
-<<<<<<< HEAD
 SET "request.header.user.agent" = 'curl/7.29.0';
 SHOW "request.header.user.agent";
 
@@ -349,7 +348,7 @@ drop table public.t1;
 drop type public.ty1;
 drop function n1.drop_table(v_schema character varying, v_table character 
varying);
 drop schema n1;
-=======
+
 -- Test GUC categories and flag patterns
 SELECT pg_settings_get_flags(NULL);
 SELECT pg_settings_get_flags('does_not_exist');
@@ -384,4 +383,3 @@ SELECT name FROM tab_settings_flags
   WHERE no_reset AND NOT no_reset_all
   ORDER BY 1;
 DROP TABLE tab_settings_flags;
->>>>>>> REL_16_9
diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
index 0a7c111676b..fa7efac2ad7 100644
--- a/src/test/regress/sql/tsearch.sql
+++ b/src/test/regress/sql/tsearch.sql
@@ -1,10 +1,7 @@
-<<<<<<< HEAD
 set optimizer_print_missing_stats = off;
-=======
 -- directory paths are passed to us in environment variables
 \getenv abs_srcdir PG_ABS_SRCDIR
 
->>>>>>> REL_16_9
 --
 -- Sanity checks for text search catalogs
 --


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to