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

[TABLELOCK] fix mysqltest about mysql lock functions

Browse Source
This commit is contained in:
YangEfei
2024-05-09 11:16:37 +00:00
committed by ob-robot
parent b2f5f2f0a6
commit 7d8e048859
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/engine/expr/ob_expr_lock_func.cpp
View File

@ -277,10 +277,7 @@ int ObExprIsFreeLock::is_free_lock(const ObExpr &expr,
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObDatum *lock_name = NULL; ObDatum *lock_name = NULL;
if (!proxy_is_support(ctx.exec_ctx_)) { if (OB_FAIL(expr.eval_param_value(ctx, lock_name))) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("obproxy is not support mysql lock function", K(ret));
} else if (OB_FAIL(expr.eval_param_value(ctx, lock_name))) {
LOG_WARN("calc param failed", K(ret)); LOG_WARN("calc param failed", K(ret));
} else if (lock_name->is_null()) { } else if (lock_name->is_null()) {
// TODO: yichang.yyf use the error code of mysql ER_USER_LOCK_WRONG_NAME or ER_USER_LOCK_OVERLONG_NAME; // TODO: yichang.yyf use the error code of mysql ER_USER_LOCK_WRONG_NAME or ER_USER_LOCK_OVERLONG_NAME;
@ -346,10 +343,7 @@ int ObExprIsUsedLock::is_used_lock(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &
uint32_t sess_id = 0; uint32_t sess_id = 0;
ObDatum *lock_name = NULL; ObDatum *lock_name = NULL;
if (!proxy_is_support(ctx.exec_ctx_)) { if (OB_FAIL(expr.eval_param_value(ctx, lock_name))) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("obproxy is not support mysql lock function", K(ret));
} else if (OB_FAIL(expr.eval_param_value(ctx, lock_name))) {
LOG_WARN("calc param failed", K(ret)); LOG_WARN("calc param failed", K(ret));
} else if (lock_name->is_null()) { } else if (lock_name->is_null()) {
// TODO: yichang.yyf use the error code of mysql ER_USER_LOCK_WRONG_NAME or ER_USER_LOCK_OVERLONG_NAME; // TODO: yichang.yyf use the error code of mysql ER_USER_LOCK_WRONG_NAME or ER_USER_LOCK_OVERLONG_NAME;