Merge branch 'pr_1577'

docs/README.md

@@ -20,6 +20,6 @@ At present, the guide is composed of the following parts:
 
 ## User documents
 
-This guide does _not_ contains user documents.
+This guide does _not_ contain user documents.
 
 For user documents, please refer to [oceanbase-doc](https://github.com/oceanbase/oceanbase-doc).

docs/build-and-run.md

@@ -30,7 +30,7 @@ bash build.sh release --init --make
 
 ## Run
 
-Now that you built the `observer` binary, you can deploy a OceanBase instance with the `obd.sh` utility:
+Now that you built the `observer` binary, you can deploy an OceanBase instance with the `obd.sh` utility:
 
 ```shell
 ./tools/deploy/obd.sh prepare -p /tmp/obtest

src/sql/dblink/ob_dblink_utils.h

@@ -164,7 +164,7 @@ private:
   int64_t sys_var_reverse_info_buf_size_;
   common::ObArenaAllocator arena_alloc_;
   ObArray<common::sqlclient::ObCommonServerConnectionPool *> dblink_conn_pool_array_;  //for dblink read to free connection when session drop.
-  ObArray<int64_t> dblink_conn_holder_array_; //for dblink write to hold connection during trasaction.
+  ObArray<int64_t> dblink_conn_holder_array_; //for dblink write to hold connection during transaction.
   ObString last_reverse_info_values_;
 };
 

src/sql/engine/dml/ob_link_op.cpp

@@ -177,7 +177,7 @@ int ObLinkOp::init_dblink(uint64_t dblink_id, ObDbLinkProxy *dblink_proxy, bool
     } else {
       dblink_conn_ = dblink_conn;
       in_xa_trascaction_ = true; //to tell link scan op don't release dblink_conn_
-      LOG_TRACE("link op get connection from xa trasaction", K(dblink_id), KP(dblink_conn_));
+      LOG_TRACE("link op get connection from xa transaction", K(dblink_id), KP(dblink_conn_));
     }
     if (OB_SUCC(ret)) {
       dblink_proxy_ = dblink_proxy;

src/sql/engine/dml/ob_link_op.h

@@ -90,7 +90,7 @@ protected:
   int64_t next_sql_req_level_;
   static const int64_t STMT_BUF_BLOCK;
   common::sqlclient::DblinkDriverProto link_type_;
-  bool in_xa_trascaction_; // is dblink write/read remote database in xa trasaction
+  bool in_xa_trascaction_; // is dblink write/read remote database in xa transaction
   static const char * head_comment_fmt_;
   static const int64_t head_comment_length_;
   static const char *proxy_route_info_fmt_;