Skip to content

Commit

Permalink
cherry pick pingcap#4600 to release-5.0
Browse files Browse the repository at this point in the history
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
  • Loading branch information
CharLotteiu authored and ti-srebot committed Jan 12, 2021
1 parent e6202c9 commit e622af5
Show file tree
Hide file tree
Showing 15 changed files with 250 additions and 16 deletions.
6 changes: 6 additions & 0 deletions TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

+ About TiDB
+ [TiDB Introduction](/overview.md)
<<<<<<< HEAD
=======
+ [What's New in TiDB 5.0](/releases/release-5.0.0-rc.md)
>>>>>>> b7c0d571... releases: add tidb 5.0-rc release notes (#4600)
+ [Basic Features](/basic-features.md)
+ Benchmarks
+ [Interaction Test on Online Workloads and `ADD INDEX`](/benchmark/online-workloads-and-add-index-operations.md)
Expand Down Expand Up @@ -513,6 +517,8 @@
+ Release Notes
+ [All Releases](/releases/release-notes.md)
+ [TiDB Roadmap](/roadmap.md)
+ v5.0
+ [5.0.0-rc](/releases/release-5.0.0-rc.md)
+ v4.0
+ [4.0.9](/releases/release-4.0.9.md)
+ [4.0.8](/releases/release-4.0.8.md)
Expand Down
2 changes: 1 addition & 1 deletion _index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Designed for the cloud, TiDB provides flexible scalability, reliability and secu

- [TiDB Introduction](/overview.md)
- [Basic Features](/basic-features.md)
- [What's New in TiDB 4.0](/whats-new-in-tidb-4.0.md)
- [What's New in TiDB 5.0](/releases/release-5.0.0-rc.md)
- [Compatibility with MySQL](/mysql-compatibility.md)
- [Usage Limitations](/tidb-limitations.md)
- [TiDB Adopters](/adopters.md)
Expand Down
2 changes: 1 addition & 1 deletion clustered-indexes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ summary: Learn how clustered indexes apply to TiDB.

# Clustered Indexes

The clustered index is an experimental feature introduced in TiDB 5.0.0-rc. This document provides multiple examples to explain how this feature makes a difference to the query performance of TiDB. To enable this feature and see the detailed operation guide, see [tidb_enable_clustered_index](/system-variables.md#tidb_enable_clustered_index).
The clustered index is an experimental feature introduced in TiDB 5.0.0-rc. This document provides multiple examples to explain how this feature makes a difference to the query performance of TiDB. To enable this feature and see the detailed operation guide, see [tidb_enable_clustered_index](/system-variables.md#tidb_enable_clustered_index-new-in-v500-rc).

Clustered indexes provide TiDB the ability to organize tables in a way that can improve the performance of certain queries. The term _clustered_ in this context refers to the _organization of how data is stored_ and not _a group of database servers working together_. Some database management systems refer to clustered indexes as _index-organized tables_ (IOT).

Expand Down
2 changes: 1 addition & 1 deletion log-redaction.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ To enable log redaction in the TiKV side, set the value of [`security.redact-inf

## Log redaction in PD side

To enable log redaction in the PD side, set the value of [`security.redact-info-log`](/pd-configuration-file.md#redact-info-log) to `true`. This configuration value defaults to `false`, which means that log redaction is disabled.
To enable log redaction in the PD side, set the value of [`security.redact-info-log`](/pd-configuration-file.md#redact-info-log-new-in-v500-rc) to `true`. This configuration value defaults to `false`, which means that log redaction is disabled.
7 changes: 7 additions & 0 deletions maintain-tidb-using-tiup.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ This document describes the following common operations when you operate and mai
- Stop the cluster
- Destroy the cluster

<<<<<<< HEAD
=======
> **Note:**
>
> Since TiDB v4.0, PingCAP no longer provides support for TiDB Ansible. Since TiDB v5.0, PingCAP no longer provides TiDB Ansible documents. If you want to read the document that introduces how to maintain a TiDB cluster using TiDB Ansible, see [TiDB Ansible Common Operations (v4.0)](https://docs.pingcap.com/tidb/v4.0/maintain-tidb-using-ansible).
>>>>>>> b7c0d571... releases: add tidb 5.0-rc release notes (#4600)
## View the cluster list

You can manage multiple TiDB clusters using the TiUP cluster component. When a TiDB cluster is deployed, the cluster appears in the TiUP cluster list.
Expand Down
4 changes: 2 additions & 2 deletions pd-configuration-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Configuration items related to security
+ The path of the PEM file that contains the X509 key
+ Default value: ""

### `redact-info-log` <!-- New in v5.0.0-rc -->
### `redact-info-log` <span class="version-mark">New in v5.0.0-rc</span>

+ Controls whether to enable log redaction in the PD log.
+ When you set the configuration value to `true`, user data is redacted in the PD log.
Expand Down Expand Up @@ -314,7 +314,7 @@ Configuration items related to scheduling
+ Determines the maximum number of operations related to adding peers within a minute
+ Default value: `15`

### `enable-joint-consensus` <!-- New in v5.0.0-rc -->
### `enable-joint-consensus` <span class="version-mark">New in v5.0.0-rc</span>

> **Warning:**
>
Expand Down
7 changes: 7 additions & 0 deletions production-deployment-using-tiup.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ summary: Learn how to easily deploy a TiDB cluster using TiUP.

TiUP supports deploying TiDB, TiFlash, TiDB Binlog, TiCDC, and the monitoring system. This document introduces how to deploy TiDB clusters of different topologies.

<<<<<<< HEAD
=======
> **Note:**
>
> Since TiDB v4.0, PingCAP no longer provides support for TiDB Ansible. Since TiDB v5.0, PingCAP no longer provides TiDB Ansible documents. If you want to read the document that introduces how to deploy a TiDB cluster using TiDB Ansible, see [Deploy TiDB Using TiDB Ansible (v4.0)](https://docs.pingcap.com/tidb/v4.0/online-deployment-using-ansible).
>>>>>>> b7c0d571... releases: add tidb 5.0-rc release notes (#4600)
## Step 1: Prerequisites and precheck

Make sure that you have read the following documents:
Expand Down
7 changes: 7 additions & 0 deletions production-offline-deployment-using-tiup.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ summary: Introduce how to deploy a TiDB cluster offline using TiUP.

This document describes how to deploy a TiDB cluster offline using TiUP.

<<<<<<< HEAD
=======
> **Note:**
>
> Since TiDB v4.0, PingCAP no longer provides support for TiDB Ansible. Since TiDB v5.0, PingCAP no longer provides TiDB Ansible documents. If you want to read the document that introduces how to deploy a TiDB cluster using TiDB Ansible offline, see [Deploy TiDB Offline Using TiDB Ansible (v4.0)](https://docs.pingcap.com/tidb/v4.0/offline-deployment-using-ansible).
>>>>>>> b7c0d571... releases: add tidb 5.0-rc release notes (#4600)
## Step 1: Prepare the TiUP offline component package

### Option 1: Download the official TiUP offline component package
Expand Down
Loading

0 comments on commit e622af5

Please sign in to comment.