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

[to #33454431] fix mysqltest & white scan

Browse Source
This commit is contained in:
obdev
2022-12-07 07:10:46 +00:00
committed by ob-robot
parent ca056ef018
commit 23a580a51c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/observer/dbms_job/ob_dbms_job_master.cpp
View File

@ -222,9 +222,7 @@ void ObDBMSJobThread::handle(void *task)
if (OB_ISNULL(task)) { if (OB_ISNULL(task)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_ERROR("null ptr", K(ret), K(task)); LOG_ERROR("null ptr", K(ret), K(task));
} else if (OB_ISNULL(master = static_cast<ObDBMSJobMaster *>(task))) { } else if (FALSE_IT(master = static_cast<ObDBMSJobMaster *>(task))) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("master is null", K(ret), K(master), K(task));
} else if (OB_FAIL(master->scheduler())) { } else if (OB_FAIL(master->scheduler())) {
LOG_ERROR("fail to run dbms job master", K(ret)); LOG_ERROR("fail to run dbms job master", K(ret));
} }

2
src/sql/engine/expr/ob_expr_udf.h
View File

@ -122,7 +122,7 @@ public:
{ {
return subprogram_path_.assign(path); return subprogram_path_.assign(path);
} }
inline void set_result_type(ObExprResType result_type) { result_type_ = result_type; } inline void set_result_type(const ObExprResType &result_type) { result_type_ = result_type; }
inline int set_params_type(common::ObIArray<ObExprResType> &params_type) inline int set_params_type(common::ObIArray<ObExprResType> &params_type)
{ {
return params_type_.assign(params_type); return params_type_.assign(params_type);