hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix mysqltest

Browse Source
This commit is contained in:
18523270951@163.com
2023-10-17 11:09:36 +00:00
committed by ob-robot
parent ed392d75cf
commit 4ea98fa483
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/px/exchange/ob_px_ms_receive_op.cpp
View File

@ -94,6 +94,10 @@ int ObPxMSReceiveOp::init_merge_sort_input(int64_t n_channel)
msi->io_event_observer_ = &io_event_observer_; msi->io_event_observer_ = &io_event_observer_;
if (OB_FAIL(merge_inputs_.push_back(msi))) { if (OB_FAIL(merge_inputs_.push_back(msi))) {
LOG_WARN("push back merge sort input fail", K(idx), K(ret)); LOG_WARN("push back merge sort input fail", K(idx), K(ret));
msi->clean_row_store(ctx_);
msi->destroy();
msi->~MergeSortInput();
mem_context_->get_malloc_allocator().free(msi);
} }
} }
} }

2
src/sql/resolver/cmd/ob_show_resolver.cpp
View File

@ -2829,7 +2829,7 @@ DEFINE_SHOW_CLAUSE_SET(SHOW_TABLE_STATUS,
"name"); "name");
DEFINE_SHOW_CLAUSE_SET(SHOW_PROCEDURE_STATUS, DEFINE_SHOW_CLAUSE_SET(SHOW_PROCEDURE_STATUS,
NULL, NULL,
"select database_name AS `Db`, routine_name AS `Name`, c.type AS `Type`, c.definer AS `Definer`, p.gmt_modified AS `Modified`, p.gmt_create AS `Created`,'DEFINER' AS `Security_type`, p.comment AS `Comment`, character_set_client, collation_connection, collation_database AS `Database Collation`from %s.%s p, %s.%s d, %s.%s c where p.tenant_id = d.tenant_id and p.database_id = d.database_id and d.database_name = c.db and p.routine_name = c.name and (case c.type when 'PROCEDURE' then 1 when 'FUNCTION' then 2 else 0 end) = p.routine_type and d.database_id = %ld and p.routine_type = %ld ORDER BY name COLLATE utf8mb4_bin ASC", "select database_name AS `Db`, routine_name AS `Name`, c.type AS `Type`, c.definer AS `Definer`, p.gmt_modified AS `Modified`, p.gmt_create AS `Created`,'DEFINER' AS `Security_type`, p.comment AS `Comment`, character_set_client, collation_connection, db_collation AS `Database Collation`from %s.%s p, %s.%s d, %s.%s c where p.tenant_id = d.tenant_id and p.database_id = d.database_id and d.database_name = c.db and p.routine_name = c.name and (case c.type when 'PROCEDURE' then 1 when 'FUNCTION' then 2 else 0 end) = p.routine_type and d.database_id = %ld and p.routine_type = %ld ORDER BY name COLLATE utf8mb4_bin ASC",
NULL, NULL,
"name"); "name");
DEFINE_SHOW_CLAUSE_SET(SHOW_TRIGGERS, DEFINE_SHOW_CLAUSE_SET(SHOW_TRIGGERS,