Author: paul
Date: 2007-07-19 21:50:16 +0200 (Thu, 19 Jul 2007)
New Revision: 7159
Log:
r27773@polar: paul | 2007-07-19 14:41:39 -0500
Begin adding WHERE clause to SHOW syntax descriptions.
Modified:
trunk/refman-5.0/information-schema.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.2/information-schema.xml
trunk/refman-5.2/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27772
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22722
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27773
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22722
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.0/information-schema.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 2; 753 bytes
@@ -3615,8 +3615,11 @@
</para>
<para>
- Several <literal>SHOW</literal> statements have been extended to
- allow a <literal>WHERE</literal> clause:
+ <literal>SHOW</literal> statements that accept a
+ <literal>LIKE</literal> clause to limit the rows displayed have
+ been extended to allow a <literal>WHERE</literal> clause that
+ enables specification of more general conditions that selected
+ rows must satisfy:
</para>
<programlisting>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.0/sql-syntax.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 10; 3281 bytes
@@ -16764,35 +16764,39 @@
</para>
<programlisting>
-SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW CREATE DATABASE <replaceable>db_name</replaceable>
SHOW CREATE FUNCTION <replaceable>funcname</replaceable>
SHOW CREATE PROCEDURE <replaceable>procname</replaceable>
SHOW CREATE TABLE <replaceable>tbl_name</replaceable>
-SHOW DATABASES [LIKE '<replaceable>pattern</replaceable>']
+SHOW DATABASES [<replaceable>like_or_where</replaceable>]
SHOW ENGINE <replaceable>engine_name</replaceable> {LOGS | STATUS }
SHOW [STORAGE] ENGINES
SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
SHOW FUNCTION CODE <replaceable>sp_name</replaceable>
-SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW FUNCTION STATUS [<replaceable>like_or_where</replaceable>]
SHOW GRANTS FOR <replaceable>user</replaceable>
SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
SHOW INNODB STATUS
SHOW PROCEDURE CODE <replaceable>sp_name</replaceable>
-SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW PROCEDURE STATUS [<replaceable>like_or_where</replaceable>]
SHOW [BDB] LOGS
SHOW MUTEX STATUS
-SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW PRIVILEGES
SHOW [FULL] PROCESSLIST
SHOW PROFILE [<replaceable>types</replaceable>] [FOR QUERY <replaceable>n</replaceable>] [OFFSET <replaceable>n</replaceable>] [LIMIT <replaceable>n</replaceable>]
SHOW PROFILES
-SHOW [GLOBAL | SESSION] STATUS [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
+SHOW [GLOBAL | SESSION] STATUS [<replaceable>like_or_where</replaceable>]
+SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW [GLOBAL | SESSION] VARIABLES [<replaceable>like_or_where</replaceable>]
SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
+
+<replaceable>like_or_where</replaceable>:
+ LIKE '<replaceable>pattern</replaceable>'
+ | WHERE <replaceable>expr</replaceable>
</programlisting>
<indexterm>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.1/information-schema.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 730 bytes
@@ -5848,8 +5848,10 @@
</para>
<para>
- Several <literal>SHOW</literal> statements have been extended to
- allow a <literal>WHERE</literal> clause:
+ <literal>SHOW</literal> statements that accept a
+ <literal>LIKE</literal> clause to limit the rows displayed also
+ allow a <literal>WHERE</literal> clause that enables specification
+ of more general conditions that selected rows must satisfy:
</para>
<programlisting>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.1/sql-syntax.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 12; 3511 bytes
@@ -18600,9 +18600,10 @@
<programlisting>
SHOW AUTHORS
-SHOW CHARACTER SET [LIKE '<replaceable>pattern</replaceable>']
-SHOW COLLATION [LIKE '<replaceable>pattern</replaceable>']
-SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW CHARACTER SET [<replaceable>like_or_where</replaceable>]
+[<replaceable>like_or_where</replaceable>]
+SHOW COLLATION [<replaceable>like_or_where</replaceable>]
+SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW CONTRIBUTORS
SHOW CREATE DATABASE <replaceable>db_name</replaceable>
SHOW CREATE EVENT <replaceable>event_name</replaceable>
@@ -18611,29 +18612,33 @@
SHOW CREATE TABLE <replaceable>tbl_name</replaceable>
SHOW CREATE TRIGGER <replaceable>trigger_name</replaceable>
SHOW CREATE VIEW <replaceable>view_name</replaceable>
-SHOW DATABASES [LIKE '<replaceable>pattern</replaceable>']
+SHOW DATABASES [<replaceable>like_or_where</replaceable>]
SHOW ENGINE <replaceable>engine_name</replaceable> {LOGS | STATUS | MUTEX}
SHOW [STORAGE] ENGINES
SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
SHOW [FULL] EVENTS
SHOW FUNCTION CODE <replaceable>sp_name</replaceable>
-SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW FUNCTION STATUS [<replaceable>like_or_where</replaceable>]
SHOW GRANTS FOR <replaceable>user</replaceable>
SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
SHOW INNODB STATUS
-SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW PROCEDURE CODE <replaceable>sp_name</replaceable>
-SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW PROCEDURE STATUS [<replaceable>like_or_where</replaceable>]
SHOW PLUGINS
SHOW PRIVILEGES
SHOW [FULL] PROCESSLIST
SHOW SCHEDULER STATUS
-SHOW [GLOBAL | SESSION] STATUS [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
+SHOW [GLOBAL | SESSION] STATUS [<replaceable>like_or_where</replaceable>]
+SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW [GLOBAL | SESSION] VARIABLES [<replaceable>like_or_where</replaceable>]
SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
+
+<replaceable>like_or_where</replaceable>:
+ LIKE '<replaceable>pattern</replaceable>'
+ | WHERE <replaceable>expr</replaceable>
</programlisting>
<indexterm>
Modified: trunk/refman-5.2/information-schema.xml
===================================================================
--- trunk/refman-5.2/information-schema.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.2/information-schema.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 730 bytes
@@ -5844,8 +5844,10 @@
</para>
<para>
- Several <literal>SHOW</literal> statements have been extended to
- allow a <literal>WHERE</literal> clause:
+ <literal>SHOW</literal> statements that accept a
+ <literal>LIKE</literal> clause to limit the rows displayed also
+ allow a <literal>WHERE</literal> clause that enables specification
+ of more general conditions that selected rows must satisfy:
</para>
<programlisting>
Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
--- trunk/refman-5.2/sql-syntax.xml 2007-07-19 19:49:13 UTC (rev 7158)
+++ trunk/refman-5.2/sql-syntax.xml 2007-07-19 19:50:16 UTC (rev 7159)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 12; 3511 bytes
@@ -18997,9 +18997,10 @@
<programlisting>
SHOW AUTHORS
-SHOW CHARACTER SET [LIKE '<replaceable>pattern</replaceable>']
-SHOW COLLATION [LIKE '<replaceable>pattern</replaceable>']
-SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW CHARACTER SET [<replaceable>like_or_where</replaceable>]
+[<replaceable>like_or_where</replaceable>]
+SHOW COLLATION [<replaceable>like_or_where</replaceable>]
+SHOW [FULL] COLUMNS FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW CONTRIBUTORS
SHOW CREATE DATABASE <replaceable>db_name</replaceable>
SHOW CREATE EVENT <replaceable>event_name</replaceable>
@@ -19008,29 +19009,33 @@
SHOW CREATE TABLE <replaceable>tbl_name</replaceable>
SHOW CREATE TRIGGER <replaceable>trigger_name</replaceable>
SHOW CREATE VIEW <replaceable>view_name</replaceable>
-SHOW DATABASES [LIKE '<replaceable>pattern</replaceable>']
+SHOW DATABASES [<replaceable>like_or_where</replaceable>]
SHOW ENGINE <replaceable>engine_name</replaceable> {LOGS | STATUS | MUTEX}
SHOW [STORAGE] ENGINES
SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
SHOW [FULL] EVENTS
SHOW FUNCTION CODE <replaceable>sp_name</replaceable>
-SHOW FUNCTION STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW FUNCTION STATUS [<replaceable>like_or_where</replaceable>]
SHOW GRANTS FOR <replaceable>user</replaceable>
SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
SHOW INNODB STATUS
-SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
+SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
SHOW PROCEDURE CODE <replaceable>sp_name</replaceable>
-SHOW PROCEDURE STATUS [LIKE '<replaceable>pattern</replaceable>']
+SHOW PROCEDURE STATUS [<replaceable>like_or_where</replaceable>]
SHOW PLUGINS
SHOW PRIVILEGES
SHOW [FULL] PROCESSLIST
SHOW SCHEDULER STATUS
-SHOW [GLOBAL | SESSION] STATUS [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
-SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
+SHOW [GLOBAL | SESSION] STATUS [<replaceable>like_or_where</replaceable>]
+SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TABLES [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW TRIGGERS [FROM <replaceable>db_name</replaceable>] [<replaceable>like_or_where</replaceable>]
+SHOW [GLOBAL | SESSION] VARIABLES [<replaceable>like_or_where</replaceable>]
SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
+
+<replaceable>like_or_where</replaceable>:
+ LIKE '<replaceable>pattern</replaceable>'
+ | WHERE <replaceable>expr</replaceable>
</programlisting>
<indexterm>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7159 - in trunk: . refman-5.0 refman-5.1 refman-5.2 | paul | 19 Jul |
