From 3b8727bda09d414d603c78ca65632c1ce8319514 Mon Sep 17 00:00:00 2001
From: Null not nil <nullnotnil1@gmail.com>
Date: Wed, 23 Sep 2020 20:54:59 -0600
Subject: [PATCH 01/15] basic features: convert to matrix

---
 basic-features.md | 198 +++++++++++++++++++++++++++++-----------------
 1 file changed, 124 insertions(+), 74 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index 74260e3ff2b49..deb00e4fa6d83 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -4,77 +4,127 @@ summary: Learn about the basic features of TiDB.
 aliases: ['/docs/dev/basic-features/']
 ---
 
-# TiDB Basic Features
-
-This document introduces the basic features of TiDB.
-
-## Data types
-
-- Numeric types: `BIT`, `BOOL|BOOLEAN`, `SMALLINT`, `MEDIUMINT`, `INT|INTEGER`, `BIGINT`, `FLOAT`, `DOUBLE`, `DECIMAL`.
-
-- Date and time types: `DATE`, `TIME`, `DATETIME`, `TIMESTAMP`, `YEAR`.
-
-- String types: `CHAR`, `VARCHAR`, `TEXT`, `TINYTEXT`, `MEDIUMTEXT`, `LONGTEXT`, `BINARY`, `VARBINARY`, `BLOB`, `TINYBLOB`, `MEDIUMBLOB`, `LONGBLOB`, `ENUM`, `SET`.
-
-- The `JSON` type.
-
-## Operators
-
-- Arithmetic operators, bit operators, comparison operators, logical operators, date and time operators, and so on.
-
-## Character sets and collations
-
-- Character sets: `UTF8`, `UTF8MB4`, `BINARY`, `ASCII`, `LATIN1`.
-
-- Collations: `UTF8MB4_GENERAL_CI`, `UTF8MB4_UNICODE_CI`, `UTF8MB4_GENERAL_BIN`, `UTF8_GENERAL_CI`, `UTF8_UNICODE_CI`, `UTF8_GENERAL_BIN`, `BINARY`.
-
-## Functions
-
-- Control flow functions, string functions, date and time functions, bit functions, data type conversion functions, data encryption and decryption functions, compression and decompression functions, information functions, JSON functions, aggregation functions, window functions, and so on.
-
-## SQL statements
-
-- Fully supports standard Data Definition Language (DDL) statements, such as `CREATE`, `DROP`, `ALTER`, `RENAME`, `TRUNCATE`, and so on.
-
-- Fully supports standard Data Manipulation Language (DML) statements, such as `INSERT`, `REPLACE`, `SELECT`, subqueries, `UPDATE`, `LOAD DATA`, and so on.
-
-- Fully supports standard transactional and locking statements, such as `START TRANSACTION`, `COMMIT`, `ROLLBACK`, `SET TRANSACTION`, and so on.
-
-- Fully supports standard database administration statements, such as `SHOW`, `SET`, and so on.
-
-- Fully supports standard utility statements, such as `DESCRIBE`, `EXPLAIN`, `USE`, and so on.
-
-- Fully supports the `GROUP BY` and `ORDER BY` clauses.
-
-- Fully supports the standard `LEFT OUTER JOIN` and `RIGHT OUTER JOIN` SQL statements.
-
-- Fully supports the standard SQL table and column aliases.
-
-## Partitioning
-
-- Supports Range partitioning
-- Supports Hash partitioning
-
-## Views
-
-- Supports general views
-
-## Constraints
-
-- Supports non-empty constraints
-- Supports primary key constraints
-- Supports unique constraints
-
-## Security
-
-- Supports privilege management based on RBAC (role-based access control)
-- Supports password management
-- Supports communication and data encryption
-- Supports IP allowlist
-- Supports audit
-
-## Tools
-
-- Supports fast backup
-- Supports data migration from MySQL to TiDB using tools
-- Supports deploying and maintaining TiDB using tools
+# TiDB Features
+
+The following table provides an overview of the feature development history of TiDB. Note that TiDB 5.0 is under active development, and the final feature set may change before release.
+
+| Data types, functions and operators                                                  | 5.0   | 4.0 | 3.1 | 3.0 | 2.1 |
+|--------------------------------------------------------------------------------------|:-----:|:---:|:---:|:---:|:---:|
+| [Numeric types](/data-type-numeric.md)                                               | Y     | Y   | Y   | Y   | Y   |
+| [Date and time types](/data-type-date-and-time.md)                                   | Y     | Y   | Y   | Y   | Y   |
+| [String types](/data-type-string.md)                                                 | Y     | Y   | Y   | Y   | Y   |
+| [JSON type](/data-type-json.md)                                                      | Experimental | Experimental | Experimental | Experimental | Experimental |
+| [Control flow functions](/functions-and-operators/control-flow-functions.md)         | Y     | Y   | Y   | Y   | Y   |
+| [String functions](/functions-and-operators/string-functions.md)                     | Y     | Y   | Y   | Y   | Y   |
+| [Numeric functions and operators](/functions-and-operators/numeric-functions-and-operators.md) | Y     | Y   | Y   | Y   | Y   |
+| [Date and time functions](/functions-and-operators/date-and-time-functions.md)       | Y     | Y   | Y   | Y   | Y   |
+| [Bit functions and operators](/functions-and-operators/bit-functions-and-operators.md) | Y     | Y   | Y   | Y   | Y   |
+| [Cast functions and operators](/functions-and-operators/cast-functions-and-operators.md) | Y     | Y   | Y   | Y   | Y   |
+| [Encryption and compression functions](/functions-and-operators/encryption-and-compression-functions.md) | Y     | Y   | Y   | Y   | Y   |
+| [Information functions](/functions-and-operators/information-functions.md)           | Y     | Y   | Y   | Y   | Y   |
+| [JSON functions](/functions-and-operators/json-functions.md)                         | Experimental | Experimental | Experimental | Experimental | Experimental |
+| [Aggregation functions](/functions-and-operators/aggregate-group-by-functions.md)    | Y     | Y   | Y   | Y   | Y   |
+| [Window functions](/functions-and-operators/window-functions.md)                     | Y     | Y   | Y   | Y   | Y   |
+| [Miscellaneous functions](/functions-and-operators/miscellaneous-functions.md)       | Y     | Y   | Y   | Y   | Y   |
+| [Operators](/functions-and-operators/operators.md)                                   | Y     | Y   | Y   | Y   | Y   |
+| **Character sets**                                                                   | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [`utf8`](/character-set-and-collation.md)                                            | Y     | Y   | Y   | Y   | Y   |
+| [`utf8mb4`](/character-set-and-collation.md)                                         | Y     | Y   | Y   | Y   | Y   |
+| [`ascii`](/character-set-and-collation.md)[1]                                        | Y     | Y   | Y   | Y   | Y   |
+| [`latin1`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| **Collations**                                                                       | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [`utf8_bin`](/character-set-and-collation.md)                                        | Y     | Y   | Y   | Y   | Y   |
+| [`utf8_general_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
+| [`utf8_unicode_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
+| [`utf8mb4_bin`](/character-set-and-collation.md)                                     | Y     | Y   | Y   | Y   | Y   |
+| [`utf8mb4_general_ci`](/character-set-and-collation.md)                              | Experimental     | Experimental   | N   | N   | N  |
+| [`utf8mb4_unicode_ci`](/character-set-and-collation.md)                              | Experimental     | Experimental   | N   | N   | N  |
+| [`ascii_bin`](/character-set-and-collation.md)                                       | Y     | Y   | Y   | Y   | Y   |
+| [`latin1_bin`](/character-set-and-collation.md)                                      | Y     | Y   | Y   | Y   | Y   |
+| [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| **Indexing and constraints**                                                         | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| Expression Indexes                                                                   | Experimental | Experimental | N   | N   | N   |
+| [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
+| [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
+| [Titan Plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
+| [Invisible Indexes](/sql-statements/sql-statement-add-index.md)                      | Y     | N   | N   | N   | N   |
+| [Composite `PRIMARY KEY`](/constraints.md)                                           | Y     | Y   | Y   | Y   | Y   |
+| [Unique indexes](/constraints.md)                                                    | Y     | Y   | Y   | Y   | Y   |
+| [Clustered index on integer `PRIMARY KEY`](/constraints.md)                          | Y     | Y   | Y   | Y   | Y   |
+| [Clustered index on composite or non-integer key](/constraints.md)                   | Experimental | N | N | N | N  |
+| **SQL statements** [2]                                                               | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| Basic `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `REPLACE`                              | Y     | Y   | Y   | Y   | Y   |
+| `INSERT ON DUPLICATE KEY UPDATE`                                                     | Y     | Y   | Y   | Y   | Y   |
+| `LOAD DATA INFILE`                                                                   | Y     | Y   | Y   | Y   | Y   |
+| `SELECT INTO OUTFILE`                                                                | Y     | Y   | N   | N   | N   |
+| `INNER JOIN`, `LEFT\|RIGHT [OUTER] JOIN`                                             | Y     | Y   | Y   | Y   | Y   |
+| `UNION`, `UNION ALL`                                                                 | Y     | Y   | Y   | Y   | Y   |
+| `GROUP BY`, `ORDER BY`                                                               | Y     | Y   | Y   | Y   | Y   |
+| `START TRANSACTION`, `COMMIT`, `ROLLBACK`                                            | Y     | Y   | Y   | Y   | Y   |
+| [`EXPLAIN`](/sql-statements/sql-statement-explain.md)                                | Y     | Y   | Y   | Y   | Y   |
+| [`EXPLAIN ANALYZE`](/sql-statements/sql-statement-explain-analyze.md)                | Y     | Y   | Y   | Y   | Y   |
+| **Advanced SQL Features**                                                            | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| Prepared statement cache                                                             | Y     | Experimental   | N   | N   | N   |
+| [SQL plan management (SPM)](/sql-plan-management.md)                                 | Y     | Y   | N   | N   | N   |
+| [Coprocessor cache](/coprocessor-cache.md)                                           | Y     | Experimental | N | N | N |
+| [Placement rules](/configure-placement-rules.md)                                     | Y     | Y   | N   | N   | N   |
+| [Follower reads](/follower-read.md)                                                  | Y     | Y   | Y   | N   | N   |
+| [Read Historical Data (tidb_snapshot)](/read-historical-data.md)                     | Y     | Y   | Y   | Y   | Y   |
+| [Optimizer Hints](/optimizer-hints.md)                                               | Y     | Y   | Y   | Y   | Y   |
+| **Data definition language (DDL)**                                                   | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| Basic `CREATE`, `DROP`, `ALTER`, `RENAME`, `TRUNCATE`                                | Y     | Y   | Y   | Y   | Y   |
+| [Generated columns](/generated-columns.md)                                           | Experimental | Experimental | Experimental | Experimental | Experimental |
+| [Views](/views.md)                                                                   | Y     | Y   | Y   | Y   | N   |
+| [Sequences](/sql-statements/sql-statement-create-sequence.md)                        | Y     | Y   | N   | N   | N   |
+| [Auto increment](/auto-increment.md)                                                 | Y     | Y   | Y   | Y   | Y   |
+| [Auto random](/auto-random.md)                                                       | Y     | Y   | N   | N   | N   |
+| DDL algorithm assertions                                                             | Y     | Y   | N   | N   | N   |
+| Multi schema change: add column(s)                                                   | Y     | N   | N   | N   | N   |
+| **Transactions**                                                                     | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| Async commit                                                                         | Y     | N   | N   | N   | N   |
+| Large transactions (10GB)                                                            | Y     | Y   | N   | N   | N   |
+| [Pessimistic transactions](/pessimistic-transaction.md)                              | Y     | Y   | Y   | Y   | Experimental |
+| [Optimistic transactions](/optimistic-transaction.md)                                | Y     | Y   | Y   | Y   | Y   |
+| [Repeatable-read isolation (snapshot isolation)](/transaction-isolation-levels.md)   | Y     | Y   | Y   | Y   | Y   |
+| [Read-committed isolation](/transaction-isolation-levels.md)                         | Y     | Y   | N   | N   | N   |
+| **Partitioning**                                                                     | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [Range partitioning](/partitioned-table.md)                                          | Y     | Y   | Y   | Y   | N   |
+| [Hash partitioning](/partitioned-table.md)                                           | Y     | Y   | Y   | Y   | N   |
+| **Statistics**                                                                       | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [CMSketch](/statistics.md)                                                           | Y     | Y   | Y   | Y   | Y   |
+| [Histograms](/statistics.md)                                                         | Y     | Y   | Y   | Y   | Y   |
+| [Extended statistics (multiple columns)](/statistics.md)                             | Experimental | N   | N   | N   | N   |
+| **Security**                                                                         | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [Transparent layer security (TLS)](/enable-tls-between-clients-and-servers.md)       | Y     | Y   | Y   | Y   | Y   |
+| [Encryption at rest (TDE)](/encryption-at-rest.md)                                   | Y     | Y   | N   | N   | N   |
+| [Role-based authentication (RBAC)](/role-based-access-control.md)                    | Y     | Y   | Y   | Y   | N   |
+| [Certificate-based authentication](/certificate-authentication.md)                   | Y     | Y   | Y   | Y   | N   |
+| Support for MySQL 8.0 clients                                                        | Y     | Y   | N   | N   | N   |
+| [MySQL compatible `GRANT` system](/privilege-management.md)                          | Y     | Y   | Y   | Y   | Y   |
+| Auditing                                                                             | Y     | Y   | Y   | Y   | Y   |
+| **Data import and export**                                                           | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [Fast Importer (TiDB Lightning)](/tidb-lightning/tidb-lightning-overview.md)         | Y     | Y   | Y   | Y   | Y   |
+| [mydumper logical dumper](/mydumper-overview.md)                                     | Deprecated | Deprecated | Y   | Y   | Y   |
+| [dumpling logical dumper](/dumpling-overview.md)                                     | Y     | Y   | N   | N   | N   |
+| [Transactional `LOAD DATA`](/sql-statements/sql-statement-load-data.md)              | Y     | N   | N   | N   | N   |
+| [Database migration toolkit (DM)](/migration-overview.md)                            | Y     | Y   | Y   | Y   | Y   |
+| [TiDB Binlog](/tidb-binlog/tidb-binlog-overview.md)                                  | Deprecated | Deprecated | Y | Y | Y |
+| [Change data capture (CDC)](/ticdc/ticdc-overview.md)                                | Y     | Y   | N   | N   | N   |
+| **Management, observability and tools**                                              | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [TiDB Dashboard](/dashboard/dashboard-intro.md)                                      | Y     | Y   | N   | N   | N   |
+| [SQL diagnostics](/information-schema/information-schema-sql-diagnostics.md)         | Experimental | Experimental | N   | N   | N   |
+| [Information schema](/information-schema/information-schema.md)                      | Y     | Y   | Y   | Y   | Y   |
+| [Metrics schema](/metrics-schema.md)                                                 | Y     | Y   | N   | N   | N   |
+| [Statements summary tables](/statement-summary-tables.md)                            | Y     | Y   | N   | N   | N   |
+| [Slow query log](/identify-slow-queries.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| [TiUP deployment](/tiup/tiup-overview.md)                                            | Y     | Y   | N   | N   | N   |
+| [Ansible deployment](/online-deployment-using-ansible.md)                            | Deprecated | Deprecated | Y   | Y   | Y   |
+| [Kubernetes operator](https://docs.pingcap.com/tidb-in-kubernetes/)                  | Y     | Y   | Y   | Y   | Y   |
+| [Built-in physical backup](/br/backup-and-restore-use-cases.md)                      | Y     | Y   | N   | N   | N   |
+| Point in time recovery (PITR)                                                        | Planned | N | N   | N   | N   |
+
+Footnotes:
+
+1. TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
+2. See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.

From 7f281029561ca5a7c8ca50fa3eba29231b534ad3 Mon Sep 17 00:00:00 2001
From: Null not nil <nullnotnil1@gmail.com>
Date: Fri, 25 Sep 2020 10:08:20 -0600
Subject: [PATCH 02/15] Address PR feedback

---
 basic-features.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index deb00e4fa6d83..ed9be3cb15f26 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -30,7 +30,7 @@ The following table provides an overview of the feature development history of T
 | **Character sets**                                                                   | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [`utf8`](/character-set-and-collation.md)                                            | Y     | Y   | Y   | Y   | Y   |
 | [`utf8mb4`](/character-set-and-collation.md)                                         | Y     | Y   | Y   | Y   | Y   |
-| [`ascii`](/character-set-and-collation.md)[1]                                        | Y     | Y   | Y   | Y   | Y   |
+| [`ascii`](/character-set-and-collation.md) [^1]                                      | Y     | Y   | Y   | Y   | Y   |
 | [`latin1`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | **Collations**                                                                       | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
@@ -44,7 +44,7 @@ The following table provides an overview of the feature development history of T
 | [`latin1_bin`](/character-set-and-collation.md)                                      | Y     | Y   | Y   | Y   | Y   |
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | **Indexing and constraints**                                                         | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
-| Expression Indexes                                                                   | Experimental | Experimental | N   | N   | N   |
+| [Expression Indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
 | [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [Titan Plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
@@ -53,7 +53,7 @@ The following table provides an overview of the feature development history of T
 | [Unique indexes](/constraints.md)                                                    | Y     | Y   | Y   | Y   | Y   |
 | [Clustered index on integer `PRIMARY KEY`](/constraints.md)                          | Y     | Y   | Y   | Y   | Y   |
 | [Clustered index on composite or non-integer key](/constraints.md)                   | Experimental | N | N | N | N  |
-| **SQL statements** [2]                                                               | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **SQL statements** [^2]                                                              | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Basic `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `REPLACE`                              | Y     | Y   | Y   | Y   | Y   |
 | `INSERT ON DUPLICATE KEY UPDATE`                                                     | Y     | Y   | Y   | Y   | Y   |
 | `LOAD DATA INFILE`                                                                   | Y     | Y   | Y   | Y   | Y   |
@@ -68,7 +68,7 @@ The following table provides an overview of the feature development history of T
 | Prepared statement cache                                                             | Y     | Experimental   | N   | N   | N   |
 | [SQL plan management (SPM)](/sql-plan-management.md)                                 | Y     | Y   | N   | N   | N   |
 | [Coprocessor cache](/coprocessor-cache.md)                                           | Y     | Experimental | N | N | N |
-| [Placement rules](/configure-placement-rules.md)                                     | Y     | Y   | N   | N   | N   |
+| [Placement rules](/configure-placement-rules.md)                                     | Y     | Experimental | N   | N   | N   |
 | [Follower reads](/follower-read.md)                                                  | Y     | Y   | Y   | N   | N   |
 | [Read Historical Data (tidb_snapshot)](/read-historical-data.md)                     | Y     | Y   | Y   | Y   | Y   |
 | [Optimizer Hints](/optimizer-hints.md)                                               | Y     | Y   | Y   | Y   | Y   |
@@ -124,7 +124,5 @@ The following table provides an overview of the feature development history of T
 | [Built-in physical backup](/br/backup-and-restore-use-cases.md)                      | Y     | Y   | N   | N   | N   |
 | Point in time recovery (PITR)                                                        | Planned | N | N   | N   | N   |
 
-Footnotes:
-
-1. TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
-2. See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.
+[^1] TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
+[^2] See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.

From bc8e89a27f2fc35c7fe8cb890eb6ff1655d4eb51 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Mon, 12 Oct 2020 22:35:20 -0600
Subject: [PATCH 03/15] fix footnote

---
 basic-features.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index ed9be3cb15f26..d35d582304cc6 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -124,5 +124,5 @@ The following table provides an overview of the feature development history of T
 | [Built-in physical backup](/br/backup-and-restore-use-cases.md)                      | Y     | Y   | N   | N   | N   |
 | Point in time recovery (PITR)                                                        | Planned | N | N   | N   | N   |
 
-[^1] TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
-[^2] See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.
+[^1]: TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
+[^2]: See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.

From 618c2272dbb3f42295b0979a9a16858c871f0fef Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Sun, 18 Oct 2020 20:08:25 -0600
Subject: [PATCH 04/15] Update 5.0 to development

---
 basic-features.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index d35d582304cc6..0af54e079fa5a 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -6,9 +6,9 @@ aliases: ['/docs/dev/basic-features/']
 
 # TiDB Features
 
-The following table provides an overview of the feature development history of TiDB. Note that TiDB 5.0 is under active development, and the final feature set may change before release.
+The following table provides an overview of the feature development history of TiDB. Note that features under active development may change before final release.
 
-| Data types, functions and operators                                                  | 5.0   | 4.0 | 3.1 | 3.0 | 2.1 |
+| Data types, functions and operators                                                  | Development | 4.0 | 3.1 | 3.0 | 2.1 |
 |--------------------------------------------------------------------------------------|:-----:|:---:|:---:|:---:|:---:|
 | [Numeric types](/data-type-numeric.md)                                               | Y     | Y   | Y   | Y   | Y   |
 | [Date and time types](/data-type-date-and-time.md)                                   | Y     | Y   | Y   | Y   | Y   |
@@ -27,13 +27,13 @@ The following table provides an overview of the feature development history of T
 | [Window functions](/functions-and-operators/window-functions.md)                     | Y     | Y   | Y   | Y   | Y   |
 | [Miscellaneous functions](/functions-and-operators/miscellaneous-functions.md)       | Y     | Y   | Y   | Y   | Y   |
 | [Operators](/functions-and-operators/operators.md)                                   | Y     | Y   | Y   | Y   | Y   |
-| **Character sets**                                                                   | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Character sets**                                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [`utf8`](/character-set-and-collation.md)                                            | Y     | Y   | Y   | Y   | Y   |
 | [`utf8mb4`](/character-set-and-collation.md)                                         | Y     | Y   | Y   | Y   | Y   |
 | [`ascii`](/character-set-and-collation.md) [^1]                                      | Y     | Y   | Y   | Y   | Y   |
 | [`latin1`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
-| **Collations**                                                                       | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Collations**                                                                       | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [`utf8_bin`](/character-set-and-collation.md)                                        | Y     | Y   | Y   | Y   | Y   |
 | [`utf8_general_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
 | [`utf8_unicode_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
@@ -43,7 +43,7 @@ The following table provides an overview of the feature development history of T
 | [`ascii_bin`](/character-set-and-collation.md)                                       | Y     | Y   | Y   | Y   | Y   |
 | [`latin1_bin`](/character-set-and-collation.md)                                      | Y     | Y   | Y   | Y   | Y   |
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
-| **Indexing and constraints**                                                         | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Indexing and constraints**                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Expression Indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
 | [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
@@ -53,7 +53,7 @@ The following table provides an overview of the feature development history of T
 | [Unique indexes](/constraints.md)                                                    | Y     | Y   | Y   | Y   | Y   |
 | [Clustered index on integer `PRIMARY KEY`](/constraints.md)                          | Y     | Y   | Y   | Y   | Y   |
 | [Clustered index on composite or non-integer key](/constraints.md)                   | Experimental | N | N | N | N  |
-| **SQL statements** [^2]                                                              | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **SQL statements** [^2]                                                              | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Basic `SELECT`, `INSERT`, `UPDATE`, `DELETE`, `REPLACE`                              | Y     | Y   | Y   | Y   | Y   |
 | `INSERT ON DUPLICATE KEY UPDATE`                                                     | Y     | Y   | Y   | Y   | Y   |
 | `LOAD DATA INFILE`                                                                   | Y     | Y   | Y   | Y   | Y   |
@@ -64,7 +64,7 @@ The following table provides an overview of the feature development history of T
 | `START TRANSACTION`, `COMMIT`, `ROLLBACK`                                            | Y     | Y   | Y   | Y   | Y   |
 | [`EXPLAIN`](/sql-statements/sql-statement-explain.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [`EXPLAIN ANALYZE`](/sql-statements/sql-statement-explain-analyze.md)                | Y     | Y   | Y   | Y   | Y   |
-| **Advanced SQL Features**                                                            | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Advanced SQL Features**                                                            | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Prepared statement cache                                                             | Y     | Experimental   | N   | N   | N   |
 | [SQL plan management (SPM)](/sql-plan-management.md)                                 | Y     | Y   | N   | N   | N   |
 | [Coprocessor cache](/coprocessor-cache.md)                                           | Y     | Experimental | N | N | N |
@@ -72,7 +72,7 @@ The following table provides an overview of the feature development history of T
 | [Follower reads](/follower-read.md)                                                  | Y     | Y   | Y   | N   | N   |
 | [Read Historical Data (tidb_snapshot)](/read-historical-data.md)                     | Y     | Y   | Y   | Y   | Y   |
 | [Optimizer Hints](/optimizer-hints.md)                                               | Y     | Y   | Y   | Y   | Y   |
-| **Data definition language (DDL)**                                                   | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Data definition language (DDL)**                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Basic `CREATE`, `DROP`, `ALTER`, `RENAME`, `TRUNCATE`                                | Y     | Y   | Y   | Y   | Y   |
 | [Generated columns](/generated-columns.md)                                           | Experimental | Experimental | Experimental | Experimental | Experimental |
 | [Views](/views.md)                                                                   | Y     | Y   | Y   | Y   | N   |
@@ -81,21 +81,21 @@ The following table provides an overview of the feature development history of T
 | [Auto random](/auto-random.md)                                                       | Y     | Y   | N   | N   | N   |
 | DDL algorithm assertions                                                             | Y     | Y   | N   | N   | N   |
 | Multi schema change: add column(s)                                                   | Y     | N   | N   | N   | N   |
-| **Transactions**                                                                     | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Transactions**                                                                     | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Async commit                                                                         | Y     | N   | N   | N   | N   |
 | Large transactions (10GB)                                                            | Y     | Y   | N   | N   | N   |
 | [Pessimistic transactions](/pessimistic-transaction.md)                              | Y     | Y   | Y   | Y   | Experimental |
 | [Optimistic transactions](/optimistic-transaction.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [Repeatable-read isolation (snapshot isolation)](/transaction-isolation-levels.md)   | Y     | Y   | Y   | Y   | Y   |
 | [Read-committed isolation](/transaction-isolation-levels.md)                         | Y     | Y   | N   | N   | N   |
-| **Partitioning**                                                                     | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Partitioning**                                                                     | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Range partitioning](/partitioned-table.md)                                          | Y     | Y   | Y   | Y   | N   |
 | [Hash partitioning](/partitioned-table.md)                                           | Y     | Y   | Y   | Y   | N   |
-| **Statistics**                                                                       | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
-| [CMSketch](/statistics.md)                                                           | Y     | Y   | Y   | Y   | Y   |
+| **Statistics**                                                                       | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [CMSketch](/statistics.md)                                                           | Deprecated | Y   | Y   | Y   | Y   |
 | [Histograms](/statistics.md)                                                         | Y     | Y   | Y   | Y   | Y   |
 | [Extended statistics (multiple columns)](/statistics.md)                             | Experimental | N   | N   | N   | N   |
-| **Security**                                                                         | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Security**                                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Transparent layer security (TLS)](/enable-tls-between-clients-and-servers.md)       | Y     | Y   | Y   | Y   | Y   |
 | [Encryption at rest (TDE)](/encryption-at-rest.md)                                   | Y     | Y   | N   | N   | N   |
 | [Role-based authentication (RBAC)](/role-based-access-control.md)                    | Y     | Y   | Y   | Y   | N   |
@@ -103,7 +103,7 @@ The following table provides an overview of the feature development history of T
 | Support for MySQL 8.0 clients                                                        | Y     | Y   | N   | N   | N   |
 | [MySQL compatible `GRANT` system](/privilege-management.md)                          | Y     | Y   | Y   | Y   | Y   |
 | Auditing                                                                             | Y     | Y   | Y   | Y   | Y   |
-| **Data import and export**                                                           | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Data import and export**                                                           | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Fast Importer (TiDB Lightning)](/tidb-lightning/tidb-lightning-overview.md)         | Y     | Y   | Y   | Y   | Y   |
 | [mydumper logical dumper](/mydumper-overview.md)                                     | Deprecated | Deprecated | Y   | Y   | Y   |
 | [dumpling logical dumper](/dumpling-overview.md)                                     | Y     | Y   | N   | N   | N   |
@@ -111,7 +111,7 @@ The following table provides an overview of the feature development history of T
 | [Database migration toolkit (DM)](/migration-overview.md)                            | Y     | Y   | Y   | Y   | Y   |
 | [TiDB Binlog](/tidb-binlog/tidb-binlog-overview.md)                                  | Deprecated | Deprecated | Y | Y | Y |
 | [Change data capture (CDC)](/ticdc/ticdc-overview.md)                                | Y     | Y   | N   | N   | N   |
-| **Management, observability and tools**                                              | **5.0** | **4.0** | **3.1** | **3.0** | **2.1** |
+| **Management, observability and tools**                                              | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [TiDB Dashboard](/dashboard/dashboard-intro.md)                                      | Y     | Y   | N   | N   | N   |
 | [SQL diagnostics](/information-schema/information-schema-sql-diagnostics.md)         | Experimental | Experimental | N   | N   | N   |
 | [Information schema](/information-schema/information-schema.md)                      | Y     | Y   | Y   | Y   | Y   |

From e2dbe6e2a94dd4333dfd00b7de4a2fa94aa5e06b Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:33:03 -0600
Subject: [PATCH 05/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index 0af54e079fa5a..ba90edaf9a766 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -27,7 +27,7 @@ The following table provides an overview of the feature development history of T
 | [Window functions](/functions-and-operators/window-functions.md)                     | Y     | Y   | Y   | Y   | Y   |
 | [Miscellaneous functions](/functions-and-operators/miscellaneous-functions.md)       | Y     | Y   | Y   | Y   | Y   |
 | [Operators](/functions-and-operators/operators.md)                                   | Y     | Y   | Y   | Y   | Y   |
-| **Character sets**                                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
+| [**Character sets**](/character-set-and-collation.md)                                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [`utf8`](/character-set-and-collation.md)                                            | Y     | Y   | Y   | Y   | Y   |
 | [`utf8mb4`](/character-set-and-collation.md)                                         | Y     | Y   | Y   | Y   | Y   |
 | [`ascii`](/character-set-and-collation.md) [^1]                                      | Y     | Y   | Y   | Y   | Y   |

From a5b2af080e1cfc046fd3c2fec4aa0c0b1bcd6000 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:33:14 -0600
Subject: [PATCH 06/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index ba90edaf9a766..4e147dd147b23 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -44,7 +44,7 @@ The following table provides an overview of the feature development history of T
 | [`latin1_bin`](/character-set-and-collation.md)                                      | Y     | Y   | Y   | Y   | Y   |
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | **Indexing and constraints**                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
-| [Expression Indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
+| [Expression indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
 | [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [Titan Plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |

From efd66aae624fb9b811febe71ec6ea65b89e80728 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:33:27 -0600
Subject: [PATCH 07/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index 4e147dd147b23..f4f6cee181232 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -47,8 +47,8 @@ The following table provides an overview of the feature development history of T
 | [Expression indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
 | [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
-| [Titan Plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
-| [Invisible Indexes](/sql-statements/sql-statement-add-index.md)                      | Y     | N   | N   | N   | N   |
+| [Titan plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
+| [Invisible indexes](/sql-statements/sql-statement-add-index.md)                      | Y     | N   | N   | N   | N   |
 | [Composite `PRIMARY KEY`](/constraints.md)                                           | Y     | Y   | Y   | Y   | Y   |
 | [Unique indexes](/constraints.md)                                                    | Y     | Y   | Y   | Y   | Y   |
 | [Clustered index on integer `PRIMARY KEY`](/constraints.md)                          | Y     | Y   | Y   | Y   | Y   |

From 6ba0de1b744fe115206095682e337e0774e78d3f Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:33:37 -0600
Subject: [PATCH 08/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index f4f6cee181232..f18fec5e53808 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -106,7 +106,7 @@ The following table provides an overview of the feature development history of T
 | **Data import and export**                                                           | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Fast Importer (TiDB Lightning)](/tidb-lightning/tidb-lightning-overview.md)         | Y     | Y   | Y   | Y   | Y   |
 | [mydumper logical dumper](/mydumper-overview.md)                                     | Deprecated | Deprecated | Y   | Y   | Y   |
-| [dumpling logical dumper](/dumpling-overview.md)                                     | Y     | Y   | N   | N   | N   |
+| [Dumpling logical dumper](/dumpling-overview.md)                                     | Y     | Y   | N   | N   | N   |
 | [Transactional `LOAD DATA`](/sql-statements/sql-statement-load-data.md)              | Y     | N   | N   | N   | N   |
 | [Database migration toolkit (DM)](/migration-overview.md)                            | Y     | Y   | Y   | Y   | Y   |
 | [TiDB Binlog](/tidb-binlog/tidb-binlog-overview.md)                                  | Deprecated | Deprecated | Y | Y | Y |

From 00c993231a8d655d0935378be77823f7eadfcca4 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:33:45 -0600
Subject: [PATCH 09/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index f18fec5e53808..646cb0e79896e 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -70,8 +70,8 @@ The following table provides an overview of the feature development history of T
 | [Coprocessor cache](/coprocessor-cache.md)                                           | Y     | Experimental | N | N | N |
 | [Placement rules](/configure-placement-rules.md)                                     | Y     | Experimental | N   | N   | N   |
 | [Follower reads](/follower-read.md)                                                  | Y     | Y   | Y   | N   | N   |
-| [Read Historical Data (tidb_snapshot)](/read-historical-data.md)                     | Y     | Y   | Y   | Y   | Y   |
-| [Optimizer Hints](/optimizer-hints.md)                                               | Y     | Y   | Y   | Y   | Y   |
+| [Read historical data (tidb_snapshot)](/read-historical-data.md)                     | Y     | Y   | Y   | Y   | Y   |
+| [Optimizer hints](/optimizer-hints.md)                                               | Y     | Y   | Y   | Y   | Y   |
 | **Data definition language (DDL)**                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | Basic `CREATE`, `DROP`, `ALTER`, `RENAME`, `TRUNCATE`                                | Y     | Y   | Y   | Y   | Y   |
 | [Generated columns](/generated-columns.md)                                           | Experimental | Experimental | Experimental | Experimental | Experimental |

From 91d8f36b50e15e1abab77013cb840b953d1d8bce Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:36:42 -0600
Subject: [PATCH 10/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index 646cb0e79896e..1d660d996f63c 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -46,7 +46,7 @@ The following table provides an overview of the feature development history of T
 | **Indexing and constraints**                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Expression indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
-| [RocksDB Engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
+| [RocksDB engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [Titan plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
 | [Invisible indexes](/sql-statements/sql-statement-add-index.md)                      | Y     | N   | N   | N   | N   |
 | [Composite `PRIMARY KEY`](/constraints.md)                                           | Y     | Y   | Y   | Y   | Y   |

From 4b11996dde30c29975f07c1c30009fd7f7f51024 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:36:52 -0600
Subject: [PATCH 11/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index 1d660d996f63c..0e1376a767fe6 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -45,7 +45,7 @@ The following table provides an overview of the feature development history of T
 | [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
 | **Indexing and constraints**                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Expression indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
-| [Columnar Storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
+| [Columnar storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |
 | [RocksDB engine](/storage-engine/rocksdb-overview.md)                                | Y     | Y   | Y   | Y   | Y   |
 | [Titan plugin](/storage-engine/titan-overview.md)                                    | Y     | Y   | Experimental | Experimental | Experimental |
 | [Invisible indexes](/sql-statements/sql-statement-add-index.md)                      | Y     | N   | N   | N   | N   |

From bc3d2210df504544d6e199a3c0fc1b27d793fe91 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:37:15 -0600
Subject: [PATCH 12/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index 0e1376a767fe6..6010f5028dd84 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -28,11 +28,11 @@ The following table provides an overview of the feature development history of T
 | [Miscellaneous functions](/functions-and-operators/miscellaneous-functions.md)       | Y     | Y   | Y   | Y   | Y   |
 | [Operators](/functions-and-operators/operators.md)                                   | Y     | Y   | Y   | Y   | Y   |
 | [**Character sets**](/character-set-and-collation.md)                                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
-| [`utf8`](/character-set-and-collation.md)                                            | Y     | Y   | Y   | Y   | Y   |
-| [`utf8mb4`](/character-set-and-collation.md)                                         | Y     | Y   | Y   | Y   | Y   |
-| [`ascii`](/character-set-and-collation.md) [^1]                                      | Y     | Y   | Y   | Y   | Y   |
-| [`latin1`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
-| [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| `utf8`                                            | Y     | Y   | Y   | Y   | Y   |
+| `utf8mb4`                                         | Y     | Y   | Y   | Y   | Y   |
+| `ascii` [^1]                                      | Y     | Y   | Y   | Y   | Y   |
+| `latin1`                                          | Y     | Y   | Y   | Y   | Y   |
+| `binary`                                          | Y     | Y   | Y   | Y   | Y   |
 | **Collations**                                                                       | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [`utf8_bin`](/character-set-and-collation.md)                                        | Y     | Y   | Y   | Y   | Y   |
 | [`utf8_general_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |

From 3b7236cb46ed9593b8819bec70dd83473afbb616 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:37:24 -0600
Subject: [PATCH 13/15] Update basic-features.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
---
 basic-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic-features.md b/basic-features.md
index 6010f5028dd84..a3bce57e05251 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -8,7 +8,7 @@ aliases: ['/docs/dev/basic-features/']
 
 The following table provides an overview of the feature development history of TiDB. Note that features under active development may change before final release.
 
-| Data types, functions and operators                                                  | Development | 4.0 | 3.1 | 3.0 | 2.1 |
+| Data types, functions, and operators                                                  | Development | 4.0 | 3.1 | 3.0 | 2.1 |
 |--------------------------------------------------------------------------------------|:-----:|:---:|:---:|:---:|:---:|
 | [Numeric types](/data-type-numeric.md)                                               | Y     | Y   | Y   | Y   | Y   |
 | [Date and time types](/data-type-date-and-time.md)                                   | Y     | Y   | Y   | Y   | Y   |

From d55b7b555e1102efa83c3039eadb4f20676138b8 Mon Sep 17 00:00:00 2001
From: Null not nil <67764674+nullnotnil@users.noreply.github.com>
Date: Tue, 27 Oct 2020 20:41:31 -0600
Subject: [PATCH 14/15] Remove link from collations

---
 basic-features.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/basic-features.md b/basic-features.md
index a3bce57e05251..209214f9ded48 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -27,22 +27,22 @@ The following table provides an overview of the feature development history of T
 | [Window functions](/functions-and-operators/window-functions.md)                     | Y     | Y   | Y   | Y   | Y   |
 | [Miscellaneous functions](/functions-and-operators/miscellaneous-functions.md)       | Y     | Y   | Y   | Y   | Y   |
 | [Operators](/functions-and-operators/operators.md)                                   | Y     | Y   | Y   | Y   | Y   |
-| [**Character sets**](/character-set-and-collation.md)                                                                   | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
-| `utf8`                                            | Y     | Y   | Y   | Y   | Y   |
-| `utf8mb4`                                         | Y     | Y   | Y   | Y   | Y   |
-| `ascii` [^1]                                      | Y     | Y   | Y   | Y   | Y   |
-| `latin1`                                          | Y     | Y   | Y   | Y   | Y   |
-| `binary`                                          | Y     | Y   | Y   | Y   | Y   |
-| **Collations**                                                                       | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
-| [`utf8_bin`](/character-set-and-collation.md)                                        | Y     | Y   | Y   | Y   | Y   |
-| [`utf8_general_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
-| [`utf8_unicode_ci`](/character-set-and-collation.md)                                 | Experimental | Experimental | N   | N   | N   |
-| [`utf8mb4_bin`](/character-set-and-collation.md)                                     | Y     | Y   | Y   | Y   | Y   |
-| [`utf8mb4_general_ci`](/character-set-and-collation.md)                              | Experimental     | Experimental   | N   | N   | N  |
-| [`utf8mb4_unicode_ci`](/character-set-and-collation.md)                              | Experimental     | Experimental   | N   | N   | N  |
-| [`ascii_bin`](/character-set-and-collation.md)                                       | Y     | Y   | Y   | Y   | Y   |
-| [`latin1_bin`](/character-set-and-collation.md)                                      | Y     | Y   | Y   | Y   | Y   |
-| [`binary`](/character-set-and-collation.md)                                          | Y     | Y   | Y   | Y   | Y   |
+| [**Character sets**](/character-set-and-collation.md)                                | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
+| `utf8`                                                                               | Y     | Y   | Y   | Y   | Y   |
+| `utf8mb4`                                                                            | Y     | Y   | Y   | Y   | Y   |
+| `ascii` [^1]                                                                         | Y     | Y   | Y   | Y   | Y   |
+| `latin1`                                                                             | Y     | Y   | Y   | Y   | Y   |
+| `binary`                                                                             | Y     | Y   | Y   | Y   | Y   |
+| [**Collations**](/character-set-and-collation.md)                                    | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
+| `utf8_bin`                                                                           | Y     | Y   | Y   | Y   | Y   |
+| `utf8_general_ci`                                                                    | Experimental | Experimental | N   | N   | N   |
+| `utf8_unicode_ci`                                                                    | Experimental | Experimental | N   | N   | N   |
+| `utf8mb4_bin`                                                                        | Y     | Y   | Y   | Y   | Y   |
+| `utf8mb4_general_ci`                                                                 | Experimental     | Experimental   | N   | N   | N  |
+| `utf8mb4_unicode_ci`                                                                 | Experimental     | Experimental   | N   | N   | N  |
+| `ascii_bin`                                                                          | Y     | Y   | Y   | Y   | Y   |
+| `latin1_bin`                                                                         | Y     | Y   | Y   | Y   | Y   |
+| `binary`                                                                             | Y     | Y   | Y   | Y   | Y   |
 | **Indexing and constraints**                                                         | **Development** | **4.0** | **3.1** | **3.0** | **2.1** |
 | [Expression indexes](/sql-statements/sql-statement-create-index.md#expression-index) | Experimental | Experimental | N   | N   | N   |
 | [Columnar storage (TiFlash)](/tiflash/tiflash-overview.md)                           | Y     | Y   | Y   | N   | N   |

From 93726c2d332f02fe61ca886627e2a8b1b9ba452b Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Wed, 4 Nov 2020 17:10:00 +0800
Subject: [PATCH 15/15] Update basic-features.md

---
 basic-features.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/basic-features.md b/basic-features.md
index 209214f9ded48..3f09706839b43 100644
--- a/basic-features.md
+++ b/basic-features.md
@@ -125,4 +125,5 @@ The following table provides an overview of the feature development history of T
 | Point in time recovery (PITR)                                                        | Planned | N | N   | N   | N   |
 
 [^1]: TiDB incorrectly treats latin1 as a subset of utf8. See [TiDB #18955](https://github.com/pingcap/tidb/issues/18955) for more details.
+
 [^2]: See [Statement Reference](/sql-statements/sql-statement-select.md) for a full list of SQL statements supported.