[CP] [FEAT MERGE] CRASH ERROR include SQL_INFO 2.0

2024-03-14 07:45:26 +00:00
parent eb197925b7
commit d6e0624219
19 changed files with 75 additions and 33 deletions
--- a/src/observer/mysql/obmp_query.cpp
+++ b/src/observer/mysql/obmp_query.cpp
@ -690,7 +690,7 @@ OB_INLINE int ObMPQuery::do_process(ObSQLSessionInfo &session,
  ObTenantCachedSchemaGuardInfo &cached_schema_info = session.get_cached_schema_guard_info();
  int64_t tenant_version = 0;
  int64_t sys_version = 0;
-  common::ObSqlInfoGuard si_guard(sql);
+  SQL_INFO_GUARD(sql, session.get_cur_sql_id());
  ObSqlFatalErrExtraInfoGuard extra_info_guard;
  extra_info_guard.set_cur_sql(sql);
  extra_info_guard.set_tenant_id(session.get_effective_tenant_id());