Skip to content

Commit ac0f4db

Browse files
authored
update several sql statements (#2859) (#2877)
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
1 parent c138aab commit ac0f4db

File tree

3 files changed

+64
-8
lines changed

3 files changed

+64
-8
lines changed

sql-statements/sql-statement-set-names.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,33 @@ The statements `SET NAMES`, `SET CHARACTER SET` and `SET CHARSET` modify the var
1111

1212
## Synopsis
1313

14-
**SetStmt:**
14+
**SetNamesStmt:**
1515

16-
![SetStmt](/media/sqlgram/SetStmt.png)
16+
![SetNamesStmt](/media/sqlgram/SetNamesStmt.png)
17+
18+
**VariableAssignmentList:**
19+
20+
![VariableAssignmentList](/media/sqlgram/VariableAssignmentList.png)
21+
22+
**VariableAssignment:**
23+
24+
![VariableAssignment](/media/sqlgram/VariableAssignment.png)
25+
26+
**CharsetName:**
27+
28+
![CharsetName](/media/sqlgram/CharsetName.png)
29+
30+
**StringName:**
31+
32+
![StringName](/media/sqlgram/StringName.png)
33+
34+
**CharsetKw:**
35+
36+
![CharsetKw](/media/sqlgram/CharsetKw.png)
37+
38+
**CharsetNameOrDefault:**
39+
40+
![CharsetNameOrDefault](/media/sqlgram/CharsetNameOrDefault.png)
1741

1842
## Examples
1943

sql-statements/sql-statement-show-columns-from.md

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,42 @@ The statements `SHOW [FULL] FIELDS FROM`, `DESC <table>`, `DESCRIBE <table>` and
1717

1818
![ShowStmt](/media/sqlgram/ShowStmt.png)
1919

20-
**ShowTargetFilterable:**
20+
**ShowColumnsFilterable:**
2121

22-
![ShowTargetFilterable](/media/sqlgram/ShowTargetFilterable.png)
22+
![ShowColumnsFilterable](/media/sqlgram/ShowColumnsFilterable.png)
2323

2424
**OptFull:**
2525

2626
![OptFull](/media/sqlgram/OptFull.png)
2727

28+
**FieldsOrColumns:**
29+
30+
![FieldsOrColumns](/media/sqlgram/FieldsOrColumns.png)
31+
32+
**ShowTableAliasOpt:**
33+
34+
![ShowTableAliasOpt](/media/sqlgram/ShowTableAliasOpt.png)
35+
36+
**FromOrIn:**
37+
38+
![FromOrIn](/media/sqlgram/FromOrIn.png)
39+
40+
**TableName:**
41+
42+
![TableName](/media/sqlgram/TableName.png)
43+
44+
**ShowDatabaseNameOpt:**
45+
46+
![ShowDatabaseNameOpt](/media/sqlgram/ShowDatabaseNameOpt.png)
47+
48+
**DBName:**
49+
50+
![DBName](/media/sqlgram/DBName.png)
51+
52+
**ShowLikeOrWhereOpt:**
53+
54+
![ShowLikeOrWhereOpt](/media/sqlgram/ShowLikeOrWhereOpt.png)
55+
2856
## Examples
2957

3058
```sql
@@ -85,7 +113,7 @@ mysql> show full columns from mysql.user;
85113
+-----------------------+---------------+-------------+------+------+---------+-------+---------------------------------+---------+
86114
| Host | char(64) | utf8mb4_bin | NO | PRI | NULL | | select,insert,update,references | |
87115
| User | char(32) | utf8mb4_bin | NO | PRI | NULL | | select,insert,update,references | |
88-
| Password | char(41) | utf8mb4_bin | YES | | NULL | | select,insert,update,references | |
116+
| authentication_string | text | utf8mb4_bin | YES | | NULL | | select,insert,update,references | |
89117
| Select_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
90118
| Insert_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
91119
| Update_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
@@ -112,8 +140,12 @@ mysql> show full columns from mysql.user;
112140
| Create_role_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
113141
| Drop_role_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
114142
| Account_locked | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
143+
| Shutdown_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
144+
| Reload_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
145+
| FILE_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
146+
| Config_priv | enum('N','Y') | utf8mb4_bin | NO | | N | | select,insert,update,references | |
115147
+-----------------------+---------------+-------------+------+------+---------+-------+---------------------------------+---------+
116-
29 rows in set (0.00 sec)
148+
33 rows in set (0.01 sec)
117149
```
118150

119151
## MySQL compatibility

sql-statements/sql-statement-show-create-sequence.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The `SHOW CREATE SEQUENCE` shows the detailed information of a sequence, which i
1111

1212
## Synopsis
1313

14-
**ShowStmt:**
14+
**ShowCreateSequenceStmt:**
1515

16-
![ShowStmt](/media/sqlgram/ShowStmt.png)
16+
![ShowCreateSequenceStmt](/media/sqlgram/ShowCreateSequenceStmt.png)
1717

1818
**TableName:**
1919

0 commit comments

Comments
 (0)