From dbc5584a8d05838d5eaabe1f518366bbb6dda792 Mon Sep 17 00:00:00 2001 From: 0xacc Date: Mon, 27 Nov 2023 07:00:41 +0000 Subject: [PATCH] [CP] [to #53421157] fix mysql.proc RETURNS for procedures --- src/observer/virtual_table/ob_mysql_proc_table.cpp | 12 +----------- .../test_suite/pl/r/mysql/pl_show_mysql.result | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/observer/virtual_table/ob_mysql_proc_table.cpp b/src/observer/virtual_table/ob_mysql_proc_table.cpp index 636060bc40..28324fc74f 100644 --- a/src/observer/virtual_table/ob_mysql_proc_table.cpp +++ b/src/observer/virtual_table/ob_mysql_proc_table.cpp @@ -205,17 +205,7 @@ int ObMySQLProcTable::inner_get_next_row(common::ObNewRow *&row) SHARE_SCHEMA_LOG(WARN, "fail to get data type str", KPC(routine_info->get_ret_type())); } } else { - ObDataType ret_type; - if (OB_FAIL(ob_sql_type_str(returns_buf, - returns_buf_size, - pos, - ret_type.get_obj_type(), - ret_type.get_length(), - ret_type.get_precision(), - ret_type.get_scale(), - ret_type.get_collation_type()))) { - SHARE_SCHEMA_LOG(WARN, "fail to get data type str", K(ret_type)); - } + // proc no returns, fill empty. } if (OB_SUCC(ret)) { ObString value_str(static_cast(pos), static_cast(pos), returns_buf); diff --git a/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_show_mysql.result b/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_show_mysql.result index aebe6b14f9..75bece067f 100644 --- a/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_show_mysql.result +++ b/tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_show_mysql.result @@ -89,9 +89,9 @@ from mysql.proc +------+------+-----------+---------------+----------+-----------------+------------------+---------------+------------+---------+-----------+ | db | name | type | specific_name | language | sql_data_access | is_deterministic | security_type | param_list | returns | body | +------+------+-----------+---------------+----------+-----------------+------------------+---------------+------------+---------+-----------+ -| test | f | PROCEDURE | f | SQL | CONTAINS_SQL | NO | DEFINER | x int | null | begin +| test | f | PROCEDURE | f | SQL | CONTAINS_SQL | NO | DEFINER | x int | | begin end | -| test | p | PROCEDURE | p | SQL | CONTAINS_SQL | NO | DEFINER | x int | null | begin +| test | p | PROCEDURE | p | SQL | CONTAINS_SQL | NO | DEFINER | x int | | begin end | +------+------+-----------+---------------+----------+-----------------+------------------+---------------+------------+---------+-----------+ drop procedure f;