diff --git a/docs/README.md b/docs/README.md index f4e73fe116..f425587b1e 100644 --- a/docs/README.md +++ b/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). diff --git a/docs/build-and-run.md b/docs/build-and-run.md index 1b387d65ae..599f75285c 100644 --- a/docs/build-and-run.md +++ b/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 diff --git a/src/sql/dblink/ob_dblink_utils.h b/src/sql/dblink/ob_dblink_utils.h index 68e087a045..9fbf09e15e 100644 --- a/src/sql/dblink/ob_dblink_utils.h +++ b/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 dblink_conn_pool_array_; //for dblink read to free connection when session drop. - ObArray dblink_conn_holder_array_; //for dblink write to hold connection during trasaction. + ObArray dblink_conn_holder_array_; //for dblink write to hold connection during transaction. ObString last_reverse_info_values_; }; diff --git a/src/sql/engine/dml/ob_link_op.cpp b/src/sql/engine/dml/ob_link_op.cpp index 26c695efcc..b5a1431636 100644 --- a/src/sql/engine/dml/ob_link_op.cpp +++ b/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; diff --git a/src/sql/engine/dml/ob_link_op.h b/src/sql/engine/dml/ob_link_op.h index c0a1968b7d..77025abaf1 100644 --- a/src/sql/engine/dml/ob_link_op.h +++ b/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_;