From 3db7eaf51f4c018f883edf39c213085640e5a938 Mon Sep 17 00:00:00 2001 From: zhaoyiping0622 Date: Tue, 26 Nov 2024 05:18:27 +0000 Subject: [PATCH] Revert fix inner_table.desc_sys_views_in_sys in master --- .../inner_table/r/mysql/desc_sys_views_in_sys.result | 3 +++ .../test_suite/inner_table/t/desc_sys_views_in_sys.test | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result index 81e61cc95..330d9afa9 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result @@ -272,6 +272,9 @@ DEFINER varchar(93) NO CHARACTER_SET_CLIENT varchar(32) NO NULL COLLATION_CONNECTION varchar(32) NO NULL DATABASE_COLLATION varchar(32) NO NULL +select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from information_schema.ROUTINES limit 1); +cnt +1 desc information_schema.PROFILING; Field Type Null Key Default Extra QUERY_ID bigint(20) NO diff --git a/tools/deploy/mysql_test/test_suite/inner_table/t/desc_sys_views_in_sys.test b/tools/deploy/mysql_test/test_suite/inner_table/t/desc_sys_views_in_sys.test index 04e07914c..f14e23692 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/t/desc_sys_views_in_sys.test +++ b/tools/deploy/mysql_test/test_suite/inner_table/t/desc_sys_views_in_sys.test @@ -50,11 +50,6 @@ if ($table_name == 'DBA_TAB_COL_STATISTICS') { let $query_type = 2; } -# 先不对ROUTINES视图进行select操作 -if ($table_name == 'ROUTINES') -{ -let $query_type = 3; -} if ($query_type == 1) {