From 95e66f7b25105fa86082435c990b96e1ab5a25e9 Mon Sep 17 00:00:00 2001
From: xudong963 <wxd963996380@gmail.com>
Date: Sat, 14 May 2022 16:44:13 +0800
Subject: [PATCH] fix conflict

---
 .../suites/0_stateless/20+_others/20_0001_planner_v2.result | 6 ++----
 tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql  | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result
index 0bc6643b5083..3d8008f50694 100644
--- a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result
+++ b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result
@@ -234,13 +234,11 @@ new_planner
 18
 ====Memory Table====
 1
-====Context Function====
-default
-===================
 === Test Subquery In From ===
 1
 2
 0	0	5
 0	4	5
 0	8	5
-===================
+====Context Function====
+default
diff --git a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql
index 9ddc3d272190..c0be334510d3 100644
--- a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql
+++ b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql
@@ -161,7 +161,6 @@ create table temp (a int) engine = Memory;
 insert into temp values (1);
 select a from temp;
 drop table temp;
-select '===================';
 
 -- subquery in from
 select '=== Test Subquery In From ===';
@@ -170,7 +169,6 @@ insert into t values(1, 2),(2, 3);
 select t1.a from (select * from t) as t1;
 SELECT a,b,count() from (SELECT cast((number%4) AS bigint) as a, cast((number%20) AS bigint) as b from numbers(100)) group by a,b order by a,b limit 3 ;
 drop table t;
-select '===================';
 
 select '====Context Function====';
 use default;