svn commit - mysqldoc@docsrva: r406 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2005-11-23 22:01:01 +0100 (Wed, 23 Nov 2005)
New Revision: 406

Log:
 r1224@kite-hub:  paul | 2005-11-23 13:16:48 -0600
 Point out that SHOW GRANTS displays only explicitly granted privileges.
 Add help markup for SHOW GRANTS.


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:4035
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1223
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4035
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1224

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2005-11-23 21:00:45 UTC (rev 405)
+++ trunk/refman-4.1/sql-syntax.xml	2005-11-23 21:01:01 UTC (rev 406)
@@ -13611,10 +13611,20 @@
           <primary>SHOW GRANTS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW GRANTS"/>
+
+        <remark role="help-keywords">
+          SHOW GRANTS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW GRANTS FOR <replaceable>user</replaceable>
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement lists the <literal>GRANT</literal> statements
           that must be issued to duplicate the privileges that are
@@ -13642,6 +13652,8 @@
 SHOW GRANTS FOR CURRENT_USER();
 </programlisting>
 
+        <remark role="help-description-end"/>
+
         <para>
           Before MySQL 4.1.2, you can find out what user the session was
           authenticated as by selecting the value of the
@@ -13652,6 +13664,15 @@
         </para>
 
         <para>
+          <literal>SHOW GRANTS</literal> displays only the privileges
+          granted explicitly to the named account. Other privileges
+          might be available to the account, but they are not displayed.
+          For example, if an anonymous account exists, the named account
+          might be able to use its privileges, but <literal>SHOW
+          GRANTS</literal> will not display them.
+        </para>
+
+        <para>
           <literal>SHOW GRANTS</literal> is available as of MySQL
           3.23.4.
         </para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2005-11-23 21:00:45 UTC (rev 405)
+++ trunk/refman-5.0/sql-syntax.xml	2005-11-23 21:01:01 UTC (rev 406)
@@ -14907,10 +14907,20 @@
           <primary>SHOW GRANTS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW GRANTS"/>
+
+        <remark role="help-keywords">
+          SHOW GRANTS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW GRANTS FOR <replaceable>user</replaceable>
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement lists the <literal>GRANT</literal> statements
           that must be issued to duplicate the privileges that are
@@ -14938,6 +14948,17 @@
 SHOW GRANTS FOR CURRENT_USER();
 </programlisting>
 
+        <remark role="help-description-end"/>
+
+        <para>
+          <literal>SHOW GRANTS</literal> displays only the privileges
+          granted explicitly to the named account. Other privileges
+          might be available to the account, but they are not displayed.
+          For example, if an anonymous account exists, the named account
+          might be able to use its privileges, but <literal>SHOW
+          GRANTS</literal> will not display them.
+        </para>
+
       </section>
 
       <section id="show-index">

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2005-11-23 21:00:45 UTC (rev 405)
+++ trunk/refman-5.1/sql-syntax.xml	2005-11-23 21:01:01 UTC (rev 406)
@@ -15388,10 +15388,20 @@
           <primary>SHOW GRANTS</primary>
         </indexterm>
 
+        <remark role="help-topic" condition="SHOW GRANTS"/>
+
+        <remark role="help-keywords">
+          SHOW GRANTS
+        </remark>
+
+        <remark role="help-syntax"/>
+
 <programlisting>
 SHOW GRANTS FOR <replaceable>user</replaceable>
 </programlisting>
 
+        <remark role="help-description-begin"/>
+
         <para>
           This statement lists the <literal>GRANT</literal> statements
           that must be issued to duplicate the privileges that are
@@ -15419,6 +15429,17 @@
 SHOW GRANTS FOR CURRENT_USER();
 </programlisting>
 
+        <remark role="help-description-end"/>
+
+        <para>
+          <literal>SHOW GRANTS</literal> displays only the privileges
+          granted explicitly to the named account. Other privileges
+          might be available to the account, but they are not displayed.
+          For example, if an anonymous account exists, the named account
+          might be able to use its privileges, but <literal>SHOW
+          GRANTS</literal> will not display them.
+        </para>
+
       </section>
 
       <section id="show-index">