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

to issue<51613550>:fix core when upate plsql_ccflag var

Browse Source
This commit is contained in:
hanr881
2023-08-17 12:11:55 +00:00
committed by ob-robot
parent 8f5bd3f501
commit cac1b6f7f1
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pl/ob_pl.cpp
View File

@ -1083,7 +1083,8 @@ int ObPLContext::set_exec_env(ObPLFunction &routine)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
CK (OB_NOT_NULL(session_info_)); CK (OB_NOT_NULL(session_info_));
OZ (exec_env_.load(*session_info_)); CK (OB_NOT_NULL(my_exec_ctx_));
OZ (exec_env_.load(*session_info_, &my_exec_ctx_->get_allocator()));
if (OB_SUCC(ret) && exec_env_ != routine.get_exec_env()) { if (OB_SUCC(ret) && exec_env_ != routine.get_exec_env()) {
OZ (routine.get_exec_env().store(*session_info_)); OZ (routine.get_exec_env().store(*session_info_));
OX (need_reset_exec_env_ = true); OX (need_reset_exec_env_ = true);

6
src/sql/session/ob_basic_session_info.cpp
View File

@ -6310,7 +6310,7 @@ int ObExecEnv::init(const ObString &exec_env)
#undef SET_ENV_VALUE #undef SET_ENV_VALUE
#undef GET_ENV_VALUE #undef GET_ENV_VALUE
int ObExecEnv::load(ObBasicSessionInfo &session) int ObExecEnv::load(ObBasicSessionInfo &session, ObIAllocator *alloc)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObObj val; ObObj val;
@ -6339,8 +6339,12 @@ int ObExecEnv::load(ObBasicSessionInfo &session)
} }
break; break;
case PLSQL_CCFLAGS: { case PLSQL_CCFLAGS: {
if (OB_NOT_NULL(alloc)) {
OZ (ob_write_string(*alloc, val.get_varchar(), plsql_ccflags_));
} else {
plsql_ccflags_ = val.get_varchar(); plsql_ccflags_ = val.get_varchar();
} }
}
break; break;
default: { default: {
ret = common::OB_ERR_UNEXPECTED; ret = common::OB_ERR_UNEXPECTED;

2
src/sql/session/ob_basic_session_info.h
View File

@ -2412,7 +2412,7 @@ public:
int64_t &pos); int64_t &pos);
int init(const ObString &exec_env); int init(const ObString &exec_env);
int load(ObBasicSessionInfo &session); int load(ObBasicSessionInfo &session, ObIAllocator *alloc = NULL);
int store(ObBasicSessionInfo &session); int store(ObBasicSessionInfo &session);
ObSQLMode get_sql_mode() { return sql_mode_; } ObSQLMode get_sql_mode() { return sql_mode_; }