Merge branch 'master' into fix_new_05

2023-09-06 11:23:56 +08:00
parent 8c370ea7c9 eb1d1ff665
commit 73c770ebab
422 changed files with 48915 additions and 4032 deletions
--- a/src/sql/engine/cmd/ob_index_executor.cpp
+++ b/src/sql/engine/cmd/ob_index_executor.cpp
@ -98,7 +98,7 @@ int ObCreateIndexExecutor::execute(ObExecContext &ctx, ObCreateIndexStmt &stmt)
        ret = OB_ERR_ADD_INDEX;
        LOG_WARN("index table id is invalid", KR(ret));
      }
-    } else if (OB_FAIL(ObDDLExecutorUtil::wait_ddl_finish(create_index_arg.tenant_id_, res.task_id_, *my_session, common_rpc_proxy))) {
+    } else if (OB_FAIL(ObDDLExecutorUtil::wait_ddl_finish(create_index_arg.tenant_id_, res.task_id_, my_session, common_rpc_proxy))) {
      LOG_WARN("failed to wait ddl finish", K(ret));
    }
  }