Skip to content

Commit fadf513

Browse files
authored
Update MySQL version references (#22839)
1 parent 50c5017 commit fadf513

21 files changed

Lines changed: 51 additions & 48 deletions

.gemini/styleguide.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ You are acting as a **senior technical writer** who is reviewing TiDB documentat
4646

4747
- Inconsistent use of technical terms
4848

49-
_"TiDB Cloud Serverless clusters" vs. "TiDB Serverless clusters"_ – pick one.
49+
_"TiDB Cloud Starter instances" vs. "TiDB Starter instances"_ – pick one.
50+
51+
- Incorrect MySQL version notation
52+
53+
Use `MySQL 8.0`, `MySQL 8.4`, or `MySQL 8.x`. Do not use `MySQL v8.0`. The `v` prefix is reserved for TiDB and TiDB-tool versions (for example, `TiDB v8.5` and `DM v2.0`). _"MySQL v8.0"__"MySQL 8.0"_.
5054

5155
- Unclear step instructions
5256

_docHome.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Connect your application with the languages and frameworks you prefer.
8282

8383
<DocHomeCard href="/tidb/stable/mysql-compatibility" label="MySQL Compatibility" icon="oss-mysql-blue">
8484

85-
TiDB is highly compatible with the MySQL protocol and the common features and syntax of MySQL 5.7 and MySQL 8.0.
85+
TiDB is highly compatible with the MySQL protocol and the common features and syntax of MySQL 8.x.
8686

8787
</DocHomeCard>
8888

character-set-and-collation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ String > Column > Table > Database > Server
443443

444444
## Validity check of characters
445445

446-
If the specified character set is `utf8` or `utf8mb4`, TiDB only supports the valid `utf8` characters. For invalid characters, TiDB reports the `incorrect utf8 value` error. This validity check of characters in TiDB is compatible with MySQL 8.0 but incompatible with MySQL 5.7 or earlier versions.
446+
If the specified character set is `utf8` or `utf8mb4`, TiDB only supports the valid `utf8` characters. For invalid characters, TiDB reports the `incorrect utf8 value` error. This validity check of characters in TiDB is compatible with MySQL 8.x but incompatible with MySQL 5.7 or earlier versions.
447447

448448
To disable this error reporting, use `set @@tidb_skip_utf8_check=1;` to skip the character check.
449449

develop/dev-guide-mysql-tools.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ After the installation, you can connect to TiDB using the following command:
2727
mysql --host <tidb_server_host> --port 4000 -u root -p --comments
2828
```
2929

30-
The MySQL v9.0 client on macOS cannot correctly load the `mysql_native_password` plugin, causing the error `ERROR 2059 (HY000): Authentication plugin 'mysql_native_password' cannot be loaded` when connecting to TiDB. To address this issue, it is recommended to install and use the MySQL v8.0 client to connect to TiDB. Run the following commands to install it:
30+
The MySQL 9.x client on macOS cannot correctly load the `mysql_native_password` plugin, causing the error `ERROR 2059 (HY000): Authentication plugin 'mysql_native_password' cannot be loaded` when connecting to TiDB. To address this issue, it is recommended to install and use the MySQL 8.0 client to connect to TiDB. Run the following commands to install it:
3131

3232
```shell
3333
brew install mysql-client@8.0
3434
brew unlink mysql
3535
brew link mysql-client@8.0
3636
```
3737

38-
If you still encounter errors, you can specify the installation path of the MySQL v8.0 client to connect to TiDB. Run the following command:
38+
If you still encounter errors, you can specify the installation path of the MySQL 8.0 client to connect to TiDB. Run the following command:
3939

4040
```shell
4141
/opt/homebrew/opt/mysql-client@8.0/bin/mysql --comments --host ${YOUR_IP_ADDRESS} --port ${YOUR_PORT_NUMBER} -u ${your_user_name} -p
4242
```
4343

44-
Replace `/opt/homebrew/opt/mysql-client@8.0/bin/mysql` in the preceding command with the installation path of the MySQL v8.0 client in your actual environment.
44+
Replace `/opt/homebrew/opt/mysql-client@8.0/bin/mysql` in the preceding command with the installation path of the MySQL 8.0 client in your actual environment.
4545

4646
</div>
4747

dm/dm-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ aliases: ['/docs/tidb-data-migration/dev/overview/','/docs/tidb-data-migration/d
1616

1717
## Basic features
1818

19-
- **Compatibility with MySQL.** DM is compatible with the MySQL protocol and most of the features and syntax of MySQL 5.7 and MySQL 8.0.
19+
- **Compatibility with MySQL.** DM is compatible with the MySQL protocol and most of the features and syntax of MySQL 5.7 and MySQL 8.x.
2020
- **Replicating DML and DDL events.** It supports parsing and replicating DML and DDL events in MySQL binlog.
2121
- **Migrating and merging MySQL shards.** DM supports migrating and merging multiple MySQL database instances upstream to one TiDB database downstream. It supports customizing replication rules for different migration scenarios. It can automatically detect and handle DDL changes of upstream MySQL shards, which greatly reduces the operational cost.
2222
- **Various types of filters.** You can predefine event types, regular expressions, and SQL expressions to filter out MySQL binlog events during the data migration process.
@@ -41,7 +41,7 @@ Before using the DM tool, note the following restrictions:
4141

4242
+ Database version requirements
4343

44-
- MySQL version 5.6 ~ 8.0
44+
- MySQL version 5.6 ~ 8.4
4545
- MariaDB version >= 10.1.2 (experimental features)
4646

4747
> **Note:**

dm/dm-precheck.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ Regardless of the migration mode you choose, the precheck always includes the fo
4747

4848
> **Warning:**
4949
>
50-
> - Migrating data from MySQL 8.0 to TiDB using DM is an experimental feature (introduced since DM v2.0). It is NOT recommended that you use it in a production environment.
51-
> - Migrating data from MariaDB to TiDB using DM is an experimental feature. It is NOT recommended that you use it in a production environment.
50+
> Migrating data from MariaDB to TiDB using DM is an experimental feature. It is NOT recommended that you use it in a production environment.
5251
5352
- Compatibility of the upstream MySQL table schema
5453

faq/tidb-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Yes, it is. When all the required services are started, you can use TiDB as easi
4444

4545
### How is TiDB compatible with MySQL?
4646

47-
Currently, TiDB supports the majority of MySQL 8.0 syntax, but does not support triggers, stored procedures, and user-defined functions. For more details, see [Compatibility with MySQL](/mysql-compatibility.md).
47+
Currently, TiDB supports the majority of MySQL 8.x syntax, but does not support triggers, stored procedures, and user-defined functions. For more details, see [Compatibility with MySQL](/mysql-compatibility.md).
4848

4949
### Does TiDB support distributed transactions?
5050

functions-and-operators/aggregate-group-by-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ group by id, val;
176176
177177
## Related system variables
178178
179-
The [`group_concat_max_len`](/system-variables.md#group_concat_max_len) variable sets the maximum number of items for the `GROUP_CONCAT()` function.
179+
The [`group_concat_max_len`](/system-variables.md#group_concat_max_len) variable sets the maximum number of items for the `GROUP_CONCAT()` function.

functions-and-operators/bit-functions-and-operators.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ The `>>` operator can also be useful for extracting specific parts of a larger n
300300

301301
## MySQL compatibility
302302

303-
There are some differences between MySQL 8.0 and earlier versions of MySQL in handling bit functions and operators. TiDB aims to follow the behavior of MySQL 8.0.
303+
There are some differences between MySQL 8.0 and earlier versions of MySQL in handling bit functions and operators. TiDB aims to follow the behavior of MySQL 8.x.
304304

305305
## Known issues
306306

307-
In the following cases, the query results in TiDB are the same as MySQL 5.7 but different from MySQL 8.0.
307+
In the following cases, the query results in TiDB are the same as MySQL 5.7 but different from MySQL 8.x.
308308

309309
- Bitwise operations with binary arguments. For more information, see [#30637](https://github.com/pingcap/tidb/issues/30637).
310310
- The result of the `BIT_COUNT()` function. For more information, see [#44621](https://github.com/pingcap/tidb/issues/44621).

functions-and-operators/encryption-and-compression-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,4 +426,4 @@ Examples:
426426

427427
* TiDB does not support the `STATEMENT_DIGEST()` and `STATEMENT_DIGEST_TEXT()` functions.
428428
* TiDB does not support the `kdf_name`, `salt`, and `iterations` arguments for [`AES_ENCRYPT()`](#aes_encrypt) and [`AES_DECRYPT`](#aes_decrypt) that MySQL added in MySQL 8.0.30.
429-
* MySQL does not implement the [`SM3()`](#sm3) function.
429+
* MySQL does not implement the [`SM3()`](#sm3) function.

0 commit comments

Comments
 (0)