(cloudberry) 02/02: With one tests in with.sql

[re...@apache.org]

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

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

commit f33f8ce3751cbba619b96f6015761dd1c687d9c8
Author: reshke <re...@double.cloud>
AuthorDate: Fri Dec 26 20:16:58 2025 +0000

    With one tests in with.sql
---
 src/test/regress/expected/with.out | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out
index 7c9c6f3fb37..82e567168b1 100644
--- a/src/test/regress/expected/with.out
+++ b/src/test/regress/expected/with.out
@@ -2910,7 +2910,6 @@ SELECT q1 FROM
   SELECT q1, (SELECT q2 FROM t_cte WHERE t_cte.q1 = i8.q1) AS t_sub
   FROM int8_tbl i8
 ) ss;
-<<<<<<< HEAD
                  QUERY PLAN
 --------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
@@ -2921,15 +2920,6 @@ SELECT q1 FROM
                Output: i8.q1, NULL::bigint
  Optimizer: Postgres query optimizer
 (7 rows)
-=======
-              QUERY PLAN              
---------------------------------------
- Subquery Scan on ss
-   Output: ss.q1
-   ->  Seq Scan on public.int8_tbl i8
-         Output: i8.q1, NULL::bigint
-(4 rows)
->>>>>>> REL_16_9
 
 SELECT q1 FROM
 (


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org