u

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
pingcap · Jul 5, 2024 · 76a1ed9 · 76a1ed9
1 parent 87073c6
commit 76a1ed9
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/cmd/explaintest/r/index_merge.result b/cmd/explaintest/r/index_merge.result
@@ -323,7 +323,7 @@ drop view if exists v2;
 create view v2 as select /*+ use_index_merge(t1) */ * from t1 where c1 < 10 or c2 < 10 and c3 < 10;
 show create view v2;
 View	Create View	character_set_client	collation_connection
-v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v2` (`c1`, `c2`, `c3`) AS SELECT /*+ USE_INDEX_MERGE(`t1` )*/ `test`.`t1`.`c1` AS `c1`,`test`.`t1`.`c2` AS `c2`,`test`.`t1`.`c3` AS `c3` FROM `test`.`t1` WHERE `c1`<10 OR `c2`<10 AND `c3`<10	utf8mb4	utf8mb4_bin
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v2` (`c1`, `c2`, `c3`) AS SELECT /*+ USE_INDEX_MERGE(`t1` )*/ `test`.`t1`.`c1` AS `c1`,`test`.`t1`.`c2` AS `c2`,`test`.`t1`.`c3` AS `c3` FROM `test`.`t1` WHERE `c1`<10 OR `c2`<10 AND `c3`<10	utf8mb4	utf8mb4_general_ci
 select * from v2 order by 1;
 c1	c2	c3
 1	1	1
@@ -850,11 +850,6 @@ CTE_0	1.80	root		Recursive CTE
     └─CTETable_16	1.00	root		Scan on CTE_0
 show warnings;
 Level	Code	Message
-<<<<<<< HEAD:cmd/explaintest/r/index_merge.result
-=======
-Warning	1815	use_index_merge(index_merge.t_alias) is inapplicable, check whether the table(index_merge.t_alias) exists
-Warning	1815	use_index_merge(index_merge.t_alias) is inapplicable, check whether the table(index_merge.t_alias) exists
->>>>>>> 2372cf828c2 (hint: avoid duplicate hints in QBHintHandler (#53921)):tests/integrationtest/r/index_merge.result
 with recursive cte1 as (select 1 c1, 1 c2, 1 c3 UNION ALL select /*+ use_index_merge(t_alias) */ c1 + 1, c2 + 1, c3 + 1 from cte1 t_alias where c1 < 10 or c2 < 10 and c3 < 10) select * from cte1 order by 1;
 c1	c2	c3
 1	1	1