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:
obdev
2023-02-07 13:14:10 +08:00
committed by ob-robot
parent 4016c033d0
commit 0fc8b58be5
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/dml/ob_dml_service.cpp
View File

@ -117,7 +117,7 @@ int ObDMLService::check_column_type(const ExprFixedArray &dml_row,
if (OB_FAIL(ObTextStringHelper::read_real_string_data(tmp_allocator, *datum,
expr->datum_meta_, expr->obj_meta_.has_lob_header(), wkb))) {
LOG_WARN("fail to get real string data", K(ret), K(wkb));
} else if (ObGeoTypeUtil::check_geo_type(column_geo_type, wkb)) {
} else if (OB_FAIL(ObGeoTypeUtil::check_geo_type(column_geo_type, wkb))) {
LOG_WARN("check geo type failed", K(ret), K(wkb));
ret = OB_ERR_CANT_CREATE_GEOMETRY_OBJECT;
LOG_USER_ERROR(OB_ERR_CANT_CREATE_GEOMETRY_OBJECT);

2
src/sql/engine/px/ob_px_worker.cpp
View File

@ -166,6 +166,8 @@ void PxWorkerFunctor::operator ()()
}
}
THIS_WORKER.set_group_id(env_arg_.get_group_id());
// When deserialize expr, sql mode will affect basic function of expr.
CompatModeGuard mode_guard(env_arg_.is_oracle_mode() ? Worker::CompatMode::ORACLE : Worker::CompatMode::MYSQL);
MTL_SWITCH(sqc_handler->get_tenant_id()) {
CREATE_WITH_TEMP_ENTITY(RESOURCE_OWNER, sqc_handler->get_tenant_id()) {
if (OB_FAIL(ROOT_CONTEXT->CREATE_CONTEXT(mem_context,

3
src/sql/optimizer/ob_log_del_upd.h
View File

@ -175,7 +175,8 @@ public:
K_(is_primary_index),
K_(ck_cst_exprs),
K_(is_update_unique_key),
K_(is_update_part_key));
K_(is_update_part_key),
K_(assignments));
};
class ObDelUpdLogPlan;