diff --git a/src/sql/engine/dml/ob_dml_service.cpp b/src/sql/engine/dml/ob_dml_service.cpp index e73a499192..ab6d8f7751 100644 --- a/src/sql/engine/dml/ob_dml_service.cpp +++ b/src/sql/engine/dml/ob_dml_service.cpp @@ -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); diff --git a/src/sql/engine/px/ob_px_worker.cpp b/src/sql/engine/px/ob_px_worker.cpp index 8cd0b9b191..bc53c729d1 100644 --- a/src/sql/engine/px/ob_px_worker.cpp +++ b/src/sql/engine/px/ob_px_worker.cpp @@ -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, diff --git a/src/sql/optimizer/ob_log_del_upd.h b/src/sql/optimizer/ob_log_del_upd.h index cda116ba38..2f1077262f 100644 --- a/src/sql/optimizer/ob_log_del_upd.h +++ b/src/sql/optimizer/ob_log_del_upd.h @@ -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;