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

[SCN] fix farm failure

Browse Source
This commit is contained in:
obdev
2022-11-28 02:58:33 +00:00
committed by ob-robot
parent 87a9357186
commit 51de5b5911
594 changed files with 9722 additions and 7770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/resolver/dcl/ob_create_user_resolver.cpp
View File

@ -256,11 +256,7 @@ int ObCreateUserResolver::resolve(const ParseNode &parse_tree)
}
}
if (OB_SUCC(ret) && NULL != resource_options) {
if (OB_UNLIKELY(GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_0_0_0)) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("create user with max connections not supported while upgrade", K(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "create user with max connections while upgrade");
} else if (T_USER_RESOURCE_OPTIONS != resource_options->type_
if (T_USER_RESOURCE_OPTIONS != resource_options->type_
|| OB_ISNULL(resource_options->children_)) {
ret = common::OB_INVALID_ARGUMENT;
LOG_WARN("invalid resource options argument", K(ret), K(resource_options->type_),

6
src/sql/resolver/dcl/ob_set_password_resolver.cpp
View File

@ -257,11 +257,7 @@ int ObSetPasswordResolver::resolve_resource_option_node(const ParseNode &resourc
{
int ret = OB_SUCCESS;
ObSetPasswordStmt *set_pwd_stmt = static_cast<ObSetPasswordStmt *>(stmt_);
if (OB_UNLIKELY(GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_0_0_0)) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("alter user set max connections not supported while upgrade", K(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "alter user set max connections while upgrade");
} else if (OB_ISNULL(set_pwd_stmt) || T_USER_RESOURCE_OPTIONS != resource_options.type_
if (OB_ISNULL(set_pwd_stmt) || T_USER_RESOURCE_OPTIONS != resource_options.type_
|| OB_ISNULL(resource_options.children_)) {
ret = common::OB_INVALID_ARGUMENT;
LOG_WARN("invalid resource options argument", K(ret), K(set_pwd_stmt),