List:Commits« Previous MessageNext Message »
From:paul Date:February 7 2006 5:50pm
Subject:svn commit - mysqldoc@docsrva: r1227 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-02-07 18:50:44 +0100 (Tue, 07 Feb 2006)
New Revision: 1227

Log:
 r2908@kite-hub:  paul | 2006-02-07 11:28:53 -0600
 Add help markup for remaining SHOW statements.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7186
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2907
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7186
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2908

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-02-07 17:50:32 UTC (rev 1226)
+++ trunk/refman-4.1/sql-syntax.xml	2006-02-07 17:50:44 UTC (rev 1227)
@@ -13955,10 +13955,20 @@
           <primary>SHOW TABLE TYPES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ENGINES"/>
+
+        <remark role="help-keywords">
+          SHOW ENGINES STORAGE
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [STORAGE] ENGINES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW ENGINES</literal> displays status information
           about the the server's storage engines. This is particularly
@@ -13968,6 +13978,8 @@
           TYPES</literal> is a deprecated synonym.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark role="note">
           Output from 4.1.13a.
         </remark>
@@ -14065,11 +14077,21 @@
           <primary>SHOW ERRORS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ERRORS"/>
+
+        <remark role="help-keywords">
+          SHOW ERRORS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) ERRORS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement is similar to <literal>SHOW WARNINGS</literal>,
           except that instead of displaying errors, warnings, and notes,
@@ -14094,6 +14116,8 @@
 SELECT @@error_count;
 </programlisting>
 
+        <remark role="help-description-end"/>
+
         <para>
           For more information, see <xref linkend="show-warnings"/>.
         </para>
@@ -14210,16 +14234,28 @@
           <primary>SHOW KEYS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW INDEX"/>
+
+        <remark role="help-keywords">
+          SHOW INDEX KEYS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns table index information.
           The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns the following fields:
         </para>
@@ -14387,6 +14423,8 @@
           columns were added in MySQL 4.0.2.
         </para>
 
+        <remark role="help-description-begin"/>
+
         <para>
           You can use
           <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
@@ -14408,16 +14446,28 @@
           <replaceable>tbl_name</replaceable></command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-innodb-status">
 
         <title>&title-show-innodb-status;</title>
 
+        <remark role="help-topic" condition="SHOW INNODB STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW INNODB STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INNODB STATUS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement shows extensive information about the state of
           the <literal>InnoDB</literal> storage engine. As of MySQL
@@ -14426,16 +14476,28 @@
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-logs">
 
         <title>&title-show-logs;</title>
 
+        <remark role="help-topic" condition="SHOW LOGS"/>
+
+        <remark role="help-keywords">
+          SHOW LOGS BDB
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [BDB] LOGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW LOGS</literal> displays status information about
           existing <literal>BDB</literal> log files. It was implemented
@@ -14446,6 +14508,8 @@
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-open-tables">
@@ -14467,16 +14531,28 @@
           they do not appear to work, so they're not listed here.
         </remark>
 
+        <remark role="help-topic" condition="SHOW OPEN TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW OPEN TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW OPEN TABLES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> returns the following
           fields:
@@ -14544,10 +14620,20 @@
           <primary>SHOW PRIVILEGES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW PRIVILEGES"/>
+
+        <remark role="help-keywords">
+          SHOW PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW PRIVILEGES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
           privileges that the MySQL server supports. This statement is
@@ -14555,6 +14641,8 @@
           depends on the version of your server.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark role="note">
           Output from 4.1.13a.
         </remark>
@@ -15381,6 +15469,14 @@
           <secondary>status</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW STATUS [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -15389,12 +15485,16 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           Partial output is shown here. The list of names and values may
           be different for your server. The meaning of each variable is
@@ -15431,6 +15531,8 @@
 +--------------------------+------------+
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern:
@@ -15449,6 +15551,8 @@
 +--------------------+----------+
 </programlisting>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-table-status">
@@ -15470,10 +15574,20 @@
           <secondary>tables</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLE STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW TABLE STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLE STATUS</literal> works likes <literal>SHOW
           TABLE</literal>, but provides a lot of information about each
@@ -15482,6 +15596,8 @@
           This statement was added in MySQL 3.23.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW TABLE STATUS</literal> returns the following
           fields:
@@ -15741,10 +15857,20 @@
           <primary>SHOW TABLES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables in a given database.
@@ -15757,6 +15883,8 @@
           single column of table names.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <emphasis role="bold">Note</emphasis>: If you have no
           privileges for a table, the table does not show up in the
@@ -15788,6 +15916,14 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW VARIABLES"/>
+
+        <remark role="help-keywords">
+          SHOW VARIABLES GLOBAL SESSION
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -15796,6 +15932,8 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
@@ -15814,6 +15952,8 @@
           synonym for <literal>SESSION</literal>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           If the default system variable values are unsuitable, you can
           set them using command options when <command>mysqld</command>
@@ -15865,6 +16005,8 @@
           using-system-variables. Revisions should be made both places.
         </remark>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern. To obtain a
@@ -15897,6 +16039,8 @@
           practice, this is rarely necessary.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-warnings">
@@ -15907,11 +16051,21 @@
           <primary>SHOW WARNINGS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW WARNINGS"/>
+
+        <remark role="help-keywords">
+          SHOW WARNINGS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) WARNINGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW WARNINGS</literal> shows the error, warning, and
           note messages that resulted from the last statement that
@@ -15954,6 +16108,8 @@
           <xref linkend="select"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           The MySQL server sends back the total number of errors,
           warnings, and notes resulting from the last statement. If you

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-02-07 17:50:32 UTC (rev 1226)
+++ trunk/refman-5.0/sql-syntax.xml	2006-02-07 17:50:44 UTC (rev 1227)
@@ -15268,10 +15268,20 @@
           <primary>SHOW TABLE TYPES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ENGINES"/>
+
+        <remark role="help-keywords">
+          SHOW ENGINES STORAGE
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [STORAGE] ENGINES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW ENGINES</literal> displays status information
           about the server's storage engines. This is particularly
@@ -15280,6 +15290,8 @@
           TYPES</literal> is a deprecated synonym.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark>
           Output shown is from 5.0.7-beta; update as required.
         </remark>
@@ -15381,11 +15393,21 @@
           <primary>SHOW ERRORS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ERRORS"/>
+
+        <remark role="help-keywords">
+          SHOW ERRORS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) ERRORS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement is similar to <literal>SHOW WARNINGS</literal>,
           except that instead of displaying errors, warnings, and notes,
@@ -15409,6 +15431,8 @@
 SELECT @@error_count;
 </programlisting>
 
+        <remark role="help-description-end"/>
+
         <para>
           For more information, see <xref linkend="show-warnings"/>.
         </para>
@@ -15511,16 +15535,28 @@
           <primary>SHOW KEYS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW INDEX"/>
+
+        <remark role="help-keywords">
+          SHOW INDEX KEYS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns table index information.
           The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns the following fields:
         </para>
@@ -15678,6 +15714,8 @@
 
         </itemizedlist>
 
+        <remark role="help-description-begin"/>
+
         <para>
           You can use
           <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
@@ -15699,38 +15737,64 @@
           <replaceable>tbl_name</replaceable></command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-innodb-status">
 
         <title>&title-show-innodb-status;</title>
 
+        <remark role="help-topic" condition="SHOW INNODB STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW INNODB STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INNODB STATUS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           In MySQL &current-series;, this is a deprecated synonym for
           <literal>SHOW ENGINE INNODB STATUS</literal>. See
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-logs">
 
         <title>&title-show-logs;</title>
 
+        <remark role="help-topic" condition="SHOW LOGS"/>
+
+        <remark role="help-keywords">
+          SHOW LOGS BDB
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [BDB] LOGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           In MySQL &current-series;, this is a deprecated synonym for
           <literal>SHOW ENGINE BDB LOGS</literal>. See
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-open-tables">
@@ -15747,16 +15811,28 @@
           <primary>SHOW OPEN TABLES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW OPEN TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW OPEN TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> returns the following
           fields:
@@ -15824,16 +15900,28 @@
           <primary>SHOW PRIVILEGES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW PRIVILEGES"/>
+
+        <remark role="help-keywords">
+          SHOW PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW PRIVILEGES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
           privileges that the MySQL server supports. The exact list of
           privileges depends on the version of your server.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark>
           Output shown is from 5.0.7-beta; update as required.
         </remark>
@@ -16721,6 +16809,14 @@
           <secondary>status</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW STATUS GLOBAL SESSION
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [GLOBAL | SESSION] STATUS [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -16729,12 +16825,16 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           Partial output is shown here. The list of names and values may
           be different for your server. The meaning of each variable is
@@ -16771,6 +16871,8 @@
 +--------------------------+------------+
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern:
@@ -16807,6 +16909,8 @@
           <literal>SESSION</literal>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-table-status">
@@ -16828,10 +16932,20 @@
           <secondary>tables</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLE STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW TABLE STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLE STATUS</literal> works likes <literal>SHOW
           TABLE</literal>, but provides a lot of information about each
@@ -16839,6 +16953,8 @@
           --status <replaceable>db_name</replaceable></command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           As of MySQL 5.0.1, this statement also displays information
           about views.
@@ -17122,10 +17238,20 @@
           <primary>SHOW TABLES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [FULL] TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables in a given database.
@@ -17152,6 +17278,8 @@
           <command>mysqlshow db_name</command>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-triggers">
@@ -17173,7 +17301,7 @@
         <remark role="help-topic" condition="SHOW TRIGGERS"/>
 
         <remark role="help-keywords">
-          TRIGGER SHOW
+          SHOW TRIGGERS
         </remark>
 
         <remark role="help-syntax"/>
@@ -17357,6 +17485,14 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW VARIABLES"/>
+
+        <remark role="help-keywords">
+          SHOW VARIABLES GLOBAL SESSION
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -17365,6 +17501,8 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
@@ -17381,6 +17519,8 @@
           synonym for <literal>SESSION</literal>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           If the default system variable values are unsuitable, you can
           set them using command options when <command>mysqld</command>
@@ -17443,6 +17583,8 @@
           using-system-variables. Revisions should be made both places.
         </remark>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern. To obtain a
@@ -17475,6 +17617,8 @@
           practice, this is rarely necessary.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-warnings">
@@ -17485,11 +17629,21 @@
           <primary>SHOW WARNINGS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW WARNINGS"/>
+
+        <remark role="help-keywords">
+          SHOW WARNINGS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) WARNINGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW WARNINGS</literal> shows the error, warning, and
           note messages that resulted from the last statement that
@@ -17531,6 +17685,8 @@
           <xref linkend="select"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           The MySQL server sends back the total number of errors,
           warnings, and notes resulting from the last statement. If you

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-02-07 17:50:32 UTC (rev 1226)
+++ trunk/refman-5.1/sql-syntax.xml	2006-02-07 17:50:44 UTC (rev 1227)
@@ -15747,10 +15747,20 @@
           <primary>SHOW TABLE TYPES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ENGINES"/>
+
+        <remark role="help-keywords">
+          SHOW ENGINES STORAGE
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [STORAGE] ENGINES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW ENGINES</literal> displays status information
           about the server's storage engines. This is particularly
@@ -15759,6 +15769,8 @@
           TYPES</literal> is a deprecated synonym.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark>
           Output shown is from 5.1.2-alpha; update as required.
         </remark>
@@ -15865,11 +15877,21 @@
           <primary>SHOW ERRORS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW ERRORS"/>
+
+        <remark role="help-keywords">
+          SHOW ERRORS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW ERRORS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) ERRORS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement is similar to <literal>SHOW WARNINGS</literal>,
           except that instead of displaying errors, warnings, and notes,
@@ -15893,6 +15915,8 @@
 SELECT @@error_count;
 </programlisting>
 
+        <remark role="help-description-end"/>
+
         <para>
           For more information, see <xref linkend="show-warnings"/>.
         </para>
@@ -15995,16 +16019,28 @@
           <primary>SHOW KEYS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW INDEX"/>
+
+        <remark role="help-keywords">
+          SHOW INDEX KEYS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INDEX FROM <replaceable>tbl_name</replaceable> [FROM <replaceable>db_name</replaceable>]
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns table index information.
           The format resembles that of the
           <literal>SQLStatistics</literal> call in ODBC.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW INDEX</literal> returns the following fields:
         </para>
@@ -16161,6 +16197,8 @@
 
         </itemizedlist>
 
+        <remark role="help-description-begin"/>
+
         <para>
           You can use
           <replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
@@ -16182,38 +16220,64 @@
           <replaceable>tbl_name</replaceable></command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-innodb-status">
 
         <title>&title-show-innodb-status;</title>
 
+        <remark role="help-topic" condition="SHOW INNODB STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW INNODB STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW INNODB STATUS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           In MySQL &current-series;, this is a deprecated synonym for
           <literal>SHOW ENGINE INNODB STATUS</literal>. See
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-logs">
 
         <title>&title-show-logs;</title>
 
+        <remark role="help-topic" condition="SHOW LOGS"/>
+
+        <remark role="help-keywords">
+          SHOW LOGS BDB
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [BDB] LOGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           In MySQL &current-series;, this is a deprecated synonym for
           <literal>SHOW ENGINE BDB LOGS</literal>. See
           <xref linkend="show-engine"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-open-tables">
@@ -16230,16 +16294,28 @@
           <primary>SHOW OPEN TABLES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW OPEN TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW OPEN TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW OPEN TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           <literal>SHOW OPEN TABLES</literal> returns the following
           fields:
@@ -16353,16 +16429,28 @@
           <primary>SHOW PRIVILEGES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW PRIVILEGES"/>
+
+        <remark role="help-keywords">
+          SHOW PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW PRIVILEGES
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW PRIVILEGES</literal> shows the list of system
           privileges that the MySQL server supports. The exact list of
           privileges depends on the version of your server.
         </para>
 
+        <remark role="help-description-end"/>
+
         <remark>
           Output shown is from 5.1.2-alpha; update as required.
         </remark>
@@ -17250,6 +17338,14 @@
           <secondary>status</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW STATUS GLOBAL SESSION
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [GLOBAL | SESSION] STATUS [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -17258,12 +17354,16 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           Partial output is shown here. The list of names and values may
           be different for your server. The meaning of each variable is
@@ -17300,6 +17400,8 @@
 +--------------------------+------------+
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern:
@@ -17334,6 +17436,8 @@
           <literal>SESSION</literal>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-table-status">
@@ -17355,10 +17459,20 @@
           <secondary>tables</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLE STATUS"/>
+
+        <remark role="help-keywords">
+          SHOW TABLE STATUS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW TABLE STATUS [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLE STATUS</literal> works likes <literal>SHOW
           TABLE</literal>, but provides a lot of information about each
@@ -17366,6 +17480,8 @@
           --status <replaceable>db_name</replaceable></command> command.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           This statement also displays information about views.
         </para>
@@ -17645,10 +17761,20 @@
           <primary>SHOW TABLES</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW TABLES"/>
+
+        <remark role="help-keywords">
+          SHOW TABLES
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [FULL] TABLES [FROM <replaceable>db_name</replaceable>] [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables in a given database.
@@ -17672,6 +17798,8 @@
           <command>mysqlshow db_name</command>.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-triggers">
@@ -17693,7 +17821,7 @@
         <remark role="help-topic" condition="SHOW TRIGGERS"/>
 
         <remark role="help-keywords">
-          TRIGGER SHOW
+          SHOW TRIGGERS
         </remark>
 
         <remark role="help-syntax"/>
@@ -17869,6 +17997,14 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW VARIABLES"/>
+
+        <remark role="help-keywords">
+          SHOW VARIABLES GLOBAL SESSION
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW [GLOBAL | SESSION] VARIABLES [LIKE '<replaceable>pattern</replaceable>']
 </programlisting>
@@ -17877,6 +18013,8 @@
           <primary><command>mysqladmin</command></primary>
         </indexterm>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
@@ -17893,6 +18031,8 @@
           synonym for <literal>SESSION</literal>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           If the default system variable values are unsuitable, you can
           set them using command options when <command>mysqld</command>
@@ -17963,6 +18103,8 @@
           using-system-variables. Revisions should be made both places.
         </remark>
 
+        <remark role="help-description-begin"/>
+
         <para>
           With a <literal>LIKE</literal> clause, the statement displays
           only those variables that match the pattern. To obtain a
@@ -17995,6 +18137,8 @@
           practice, this is rarely necessary.
         </para>
 
+        <remark role="help-description-end"/>
+
       </section>
 
       <section id="show-warnings">
@@ -18005,11 +18149,21 @@
           <primary>SHOW WARNINGS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW WARNINGS"/>
+
+        <remark role="help-keywords">
+          SHOW WARNINGS COUNT
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW WARNINGS [LIMIT [<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable>]
 SHOW COUNT(*) WARNINGS
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           <literal>SHOW WARNINGS</literal> shows the error, warning, and
           note messages that resulted from the last statement that
@@ -18051,6 +18205,8 @@
           <xref linkend="select"/>.
         </para>
 
+        <remark role="help-description-end"/>
+
         <para>
           The MySQL server sends back the total number of errors,
           warnings, and notes resulting from the last statement. If you

Thread
svn commit - mysqldoc@docsrva: r1227 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul7 Feb