update several sql statements

- sql-statements/sql-statement-set-names.md - sql-statements/sql-statement-show-columns-from.md - sql-statements/sql-statement-show-create-sequence.md
pingcap · May 25, 2020 · d5a48bd · d5a48bd
1 parent 8f64239
commit d5a48bd
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 9 deletions.
diff --git a/media/sqlgram/CharsetKw.png b/media/sqlgram/CharsetKw.png
diff --git a/media/sqlgram/CharsetName.png b/media/sqlgram/CharsetName.png
diff --git a/media/sqlgram/CharsetNameOrDefault.png b/media/sqlgram/CharsetNameOrDefault.png
diff --git a/media/sqlgram/DBName.png b/media/sqlgram/DBName.png
diff --git a/media/sqlgram/FieldsOrColumns.png b/media/sqlgram/FieldsOrColumns.png
diff --git a/media/sqlgram/SetNamesStmt.png b/media/sqlgram/SetNamesStmt.png
diff --git a/media/sqlgram/ShowColumnsFilterable.png b/media/sqlgram/ShowColumnsFilterable.png
diff --git a/media/sqlgram/ShowCreateSequenceStmt.png b/media/sqlgram/ShowCreateSequenceStmt.png
diff --git a/media/sqlgram/ShowDatabaseNameOpt.png b/media/sqlgram/ShowDatabaseNameOpt.png
diff --git a/media/sqlgram/ShowLikeOrWhereOpt.png b/media/sqlgram/ShowLikeOrWhereOpt.png
diff --git a/media/sqlgram/ShowStmt.png b/media/sqlgram/ShowStmt.png
diff --git a/media/sqlgram/ShowTableAliasOpt.png b/media/sqlgram/ShowTableAliasOpt.png
diff --git a/media/sqlgram/StringName.png b/media/sqlgram/StringName.png
diff --git a/media/sqlgram/VariableAssignment.png b/media/sqlgram/VariableAssignment.png
diff --git a/media/sqlgram/VariableAssignmentList.png b/media/sqlgram/VariableAssignmentList.png
diff --git a/sql-statements/sql-statement-set-names.md b/sql-statements/sql-statement-set-names.md
@@ -11,9 +11,33 @@ aliases: ['/docs-cn/dev/reference/sql/statements/set-names/']
 
 ## 语法图
 
-**SetStmt:**
+**SetNamesStmt:**
 
-![SetStmt](/media/sqlgram/SetStmt.png)
+![SetNamesStmt](/media/sqlgram/SetNamesStmt.png)
+
+**VariableAssignmentList:**
+
+![VariableAssignmentList](/media/sqlgram/VariableAssignmentList.png)
+
+**VariableAssignment:**
+
+![VariableAssignment](/media/sqlgram/VariableAssignment.png)
+
+**CharsetName:**
+
+![CharsetName](/media/sqlgram/CharsetName.png)
+
+**StringName:**
+
+![StringName](/media/sqlgram/StringName.png)
+
+**CharsetKw:**
+
+![CharsetKw](/media/sqlgram/CharsetKw.png)
+
+**CharsetNameOrDefault:**
+
+![CharsetNameOrDefault](/media/sqlgram/CharsetNameOrDefault.png)
 
 ## 示例
 

diff --git a/sql-statements/sql-statement-show-columns-from.md b/sql-statements/sql-statement-show-columns-from.md
@@ -17,14 +17,42 @@ aliases: ['/docs-cn/dev/reference/sql/statements/show-columns-from/']
 
 ![ShowStmt](/media/sqlgram/ShowStmt.png)
 
-**ShowTargetFilterable:**
+**ShowColumnsFilterable:**
 
-![ShowTargetFilterable](/media/sqlgram/ShowTargetFilterable.png)
+![ShowColumnsFilterable](/media/sqlgram/ShowColumnsFilterable.png)
 
 **OptFull:**
 
 ![OptFull](/media/sqlgram/OptFull.png)
 
+**FieldsOrColumns:**
+
+![FieldsOrColumns](/media/sqlgram/FieldsOrColumns.png)
+
+**ShowTableAliasOpt:**
+
+![ShowTableAliasOpt](/media/sqlgram/ShowTableAliasOpt.png)
+
+**FromOrIn:**
+
+![FromOrIn](/media/sqlgram/FromOrIn.png)
+
+**TableName:**
+
+![TableName](/media/sqlgram/TableName.png)
+
+**ShowDatabaseNameOpt:**
+
+![ShowDatabaseNameOpt](/media/sqlgram/ShowDatabaseNameOpt.png)
+
+**DBName:**
+
+![DBName](/media/sqlgram/DBName.png)
+
+**ShowLikeOrWhereOpt:**
+
+![ShowLikeOrWhereOpt](/media/sqlgram/ShowLikeOrWhereOpt.png)
+
 ## 示例
 
 {{< copyable "sql" >}}
@@ -139,7 +167,7 @@ show full columns from mysql.user;
 +-----------------------+---------------+-------------+------+------+---------+-------+---------------------------------+---------+
 | Host                  | char(64)      | utf8mb4_bin | NO   | PRI  | NULL    |       | select,insert,update,references |         |
 | User                  | char(32)      | utf8mb4_bin | NO   | PRI  | NULL    |       | select,insert,update,references |         |
-| Password              | char(41)      | utf8mb4_bin | YES  |      | NULL    |       | select,insert,update,references |         |
+| authentication_string | text          | utf8mb4_bin | YES  |      | NULL    |       | select,insert,update,references |         |
 | Select_priv           | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
 | Insert_priv           | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
 | Update_priv           | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
@@ -166,8 +194,12 @@ show full columns from mysql.user;
 | Create_role_priv      | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
 | Drop_role_priv        | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
 | Account_locked        | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
+| Shutdown_priv         | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
+| Reload_priv           | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
+| FILE_priv             | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
+| Config_priv           | enum('N','Y') | utf8mb4_bin | NO   |      | N       |       | select,insert,update,references |         |
 +-----------------------+---------------+-------------+------+------+---------+-------+---------------------------------+---------+
-29 rows in set (0.00 sec)
+33 rows in set (0.01 sec)
 ```
 
 ## MySQL 兼容性

diff --git a/sql-statements/sql-statement-show-create-sequence.md b/sql-statements/sql-statement-show-create-sequence.md
@@ -11,9 +11,9 @@ aliases: ['/docs-cn/dev/reference/sql/statements/show-create-sequence/']
 
 ## 语法图
 
-**ShowStmt:**
+**ShowCreateSequenceStmt:**
 
-![ShowStmt](/media/sqlgram/ShowStmt.png)
+![ShowCreateSequenceStmt](/media/sqlgram/ShowCreateSequenceStmt.png)
 
 **TableName:**
 
@@ -48,7 +48,7 @@ SHOW CREATE SEQUENCE seq;
 
 ## MySQL 兼容性
 
-MySQL 暂无序列选项。TiDB 序列借鉴自 MariaDB。`SETVAL` 函数的步调是 TiDB 特有的，其他函数的步调与 MariaDB 保持一致。
+MySQL 暂无序列选项。TiDB 序列部分借鉴自 MariaDB。`SETVAL` 函数的步调是 TiDB 特有的，其他函数的步调与 MariaDB 保持一致。
 
 ## 另请参阅