merge devleop into master 20231212

2024-02-08 01:29:33 +00:00
parent b6c37b4cda
commit 39cc0a6d60
44 changed files with 100 additions and 88 deletions
--- a/src/sql/ob_spi.cpp
+++ b/src/sql/ob_spi.cpp
@ -2385,7 +2385,7 @@ int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator,
              LOG_WARN("push_back error", K(ret));
            }
          }
-          // add debug info, for convinence of sql reconstruct debug
+          // add debug info, for convenience of sql reconstruct debug
          LOG_DEBUG("spi prepare, source sql and prepared reconstruct sql", K(sql),
                                              K(pl_prepare_result.result_set_->get_route_sql()));
          if (OB_SUCC(ret)) {