List:Commits« Previous MessageNext Message »
From:paul Date:January 28 2006 8:55pm
Subject:svn commit - mysqldoc@docsrva: r1086 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-28 21:55:43 +0100 (Sat, 28 Jan 2006)
New Revision: 1086

Log:
 r6821@frost:  paul | 2006-01-28 14:55:17 -0600
 Finish GRANT/REVOKE split.


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

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-28 20:55:43 UTC (rev 1086)
@@ -10404,21 +10404,15 @@
         <remark role="help-description-begin"/>
 
         <para>
-          The <literal>GRANT</literal>
-          statement enables system administrators to create MySQL user
-          accounts and to grant rights to accounts.
-          <literal>GRANT</literal> is
-          implemented in MySQL 3.22.11 or later. For earlier MySQL
-          versions, it does nothing.
+          The <literal>GRANT</literal> statement enables system
+          administrators to create MySQL user accounts and to grant
+          rights to accounts. To use <literal>GRANT</literal>, you must
+          have the <literal>GRANT OPTION</literal> privilege, and you
+          must have the privileges that you are granting.
+          <literal>GRANT</literal> is implemented in MySQL 3.22.11 or
+          later. For earlier MySQL versions, it does nothing.
         </para>
 
-          <para>
-           To use <literal>GRANT</literal>, you must have the
-           <literal>GRANT OPTION</literal> privilege, and you must have
-           the privileges that you are granting.
-         </para>
-
-
         <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
@@ -10522,42 +10516,11 @@
         <remark role="help-description-end"/>
 
         <para>
-          To make it easy to revoke all privileges, MySQL 4.1.2 has
-          added the following syntax, which drops all global, database-,
-          table-, and column-level privileges for the named users:
-        </para>
-
-<programlisting>
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
-        <para>
-          To use this <literal>REVOKE</literal> syntax, you must have
-          the global <literal>CREATE USER</literal> privilege or the
-          <literal>UPDATE</literal> privilege for the
-          <literal>mysql</literal> database.
-        </para>
-
-        <para>
-          Before MySQL 4.1.2, all privileges cannot be dropped at once.
-          Two statements are necessary:
-        </para>
-
-<programlisting>
-REVOKE ALL PRIVILEGES ON *.* FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-REVOKE GRANT OPTION ON *.* FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
-        <para>
           For the <literal>GRANT</literal> and <literal>REVOKE</literal>
           statements, <replaceable>priv_type</replaceable> can be
           specified as any of the following:
         </para>
 
-        <remark>
-          FIX agl 2002-06-13 New table, need to measure colwidths!
-        </remark>
-
         <informaltable>
           <tgroup cols="2">
             <colspec colwidth="30*"/>
@@ -11403,16 +11366,19 @@
 
         <para>
           The <literal>REVOKE</literal> statement enables system
-          administrators to revoke privileges from MySQL accounts.
-          <literal>REVOKE</literal> is
-          implemented in MySQL 3.22.11 or later. For earlier MySQL
-          versions, it does nothing.
+          administrators to revoke privileges from MySQL accounts. To
+          use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
+          <literal>REVOKE</literal> is implemented in MySQL 3.22.11 or
+          later. For earlier MySQL versions, it does nothing.
         </para>
 
         <para>
-          To use <literal>REVOKE</literal>, you must have the
-          <literal>GRANT OPTION</literal> privilege, and you must have
-          the privileges that you are revoking.
+          For details on the levels at which privileges exist, the
+          allowable <replaceable>priv_type</replaceable> values, and the
+          syntax for specifying users and passwords, see
+          <xref linkend="grant"/>
         </para>
 
         <remark role="help-description-end"/>
@@ -11429,6 +11395,33 @@
           rows might have been created prior to setting the variable.)
         </para>
 
+        <para>
+          To make it easy to revoke all privileges, MySQL 4.1.2 has
+          added the following syntax, which drops all global, database-,
+          table-, and column-level privileges for the named users:
+        </para>
+
+<programlisting>
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <para>
+          To use this <literal>REVOKE</literal> syntax, you must have
+          the global <literal>CREATE USER</literal> privilege or the
+          <literal>UPDATE</literal> privilege for the
+          <literal>mysql</literal> database.
+        </para>
+
+        <para>
+          Before MySQL 4.1.2, all privileges cannot be dropped at once.
+          Two statements are necessary:
+        </para>
+
+<programlisting>
+REVOKE ALL PRIVILEGES ON *.* FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+REVOKE GRANT OPTION ON *.* FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
       </section>
 
       <section id="set-password">

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:55:43 UTC (rev 1086)
@@ -11470,16 +11470,12 @@
         <para>
           The <literal>GRANT</literal> statement enables system
           administrators to create MySQL user accounts and to grant
-          rights to from accounts.
+          rights to from accounts. To use <literal>GRANT</literal>, you
+          must have the <literal>GRANT OPTION</literal> privilege, and
+          you must have the privileges that you are granting.
         </para>
 
         <para>
-          To use <literal>GRANT</literal>, you must have the
-          <literal>GRANT OPTION</literal> privilege, and you must have
-          the privileges that you are granting.
-        </para>
-
-        <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
           access control system are discussed extensively in
@@ -11608,23 +11604,6 @@
         <remark role="help-description-end"/>
 
         <para>
-          To revoke all privileges, use the following syntax, which
-          drops all global, database-, table-, and column-level
-          privileges for the named user or users:
-        </para>
-
-<programlisting>
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
-        <para>
-          To use this <literal>REVOKE</literal> syntax, you must have
-          the global <literal>CREATE USER</literal> privilege or the
-          <literal>UPDATE</literal> privilege for the
-          <literal>mysql</literal> database.
-        </para>
-
-        <para>
           For the <literal>GRANT</literal> and <literal>REVOKE</literal>
           statements, <replaceable>priv_type</replaceable> can be
           specified as any of the following:
@@ -12564,13 +12543,17 @@
 
         <para>
           The <literal>REVOKE</literal> statement enables system
-          administrators to revoke privileges from MySQL accounts.
+          administrators to revoke privileges from MySQL accounts. To
+          use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
         </para>
 
         <para>
-          To use <literal>REVOKE</literal>, you must have the
-          <literal>GRANT OPTION</literal> privilege, and you must have
-          the privileges that you are revoking.
+          For details on the levels at which privileges exist, the
+          allowable <replaceable>priv_type</replaceable> values, and the
+          syntax for specifying users and passwords, see
+          <xref linkend="grant"/>
         </para>
 
         <remark role="help-description-end"/>
@@ -12587,6 +12570,23 @@
           rows might have been created prior to setting the variable.)
         </para>
 
+        <para>
+          To revoke all privileges, use the following syntax, which
+          drops all global, database-, table-, and column-level
+          privileges for the named user or users:
+        </para>
+
+<programlisting>
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <para>
+          To use this <literal>REVOKE</literal> syntax, you must have
+          the global <literal>CREATE USER</literal> privilege or the
+          <literal>UPDATE</literal> privilege for the
+          <literal>mysql</literal> database.
+        </para>
+
       </section>
 
       <section id="set-password">

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:55:43 UTC (rev 1086)
@@ -11956,16 +11956,12 @@
         <para>
           The <literal>GRANT</literal> statement enables system
           administrators to create MySQL user accounts and to grant
-          rights to from accounts.
+          rights to from accounts. To use <literal>GRANT</literal>, you
+          must have the <literal>GRANT OPTION</literal> privilege, and
+          you must have the privileges that you are granting.
         </para>
 
         <para>
-          To use <literal>GRANT</literal>, you must have the
-          <literal>GRANT OPTION</literal> privilege, and you must have
-          the privileges that you are granting.
-        </para>
-
-        <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
           access control system are discussed extensively in
@@ -12094,23 +12090,6 @@
         <remark role="help-description-end"/>
 
         <para>
-          To revoke all privileges, use the following syntax, which
-          drops all global, database-, table-, and column-level
-          privileges for the named user or users:
-        </para>
-
-<programlisting>
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
-        <para>
-          To use this <literal>REVOKE</literal> syntax, you must have
-          the global <literal>CREATE USER</literal> privilege or the
-          <literal>UPDATE</literal> privilege for the
-          <literal>mysql</literal> database.
-        </para>
-
-        <para>
           For the <literal>GRANT</literal> and <literal>REVOKE</literal>
           statements, <replaceable>priv_type</replaceable> can be
           specified as any of the following:
@@ -13034,13 +13013,17 @@
 
         <para>
           The <literal>REVOKE</literal> statement enables system
-          administrators to revoke privileges from MySQL accounts.
+          administrators to revoke privileges from MySQL accounts. To
+          use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
         </para>
 
         <para>
-          To use <literal>REVOKE</literal>, you must have the
-          <literal>GRANT OPTION</literal> privilege, and you must have
-          the privileges that you are revoking.
+          For details on the levels at which privileges exist, the
+          allowable <replaceable>priv_type</replaceable> values, and the
+          syntax for specifying users and passwords, see
+          <xref linkend="grant"/>
         </para>
 
         <remark role="help-description-end"/>
@@ -13057,6 +13040,23 @@
           rows might have been created prior to setting the variable.)
         </para>
 
+        <para>
+          To revoke all privileges, use the following syntax, which
+          drops all global, database-, table-, and column-level
+          privileges for the named user or users:
+        </para>
+
+<programlisting>
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <para>
+          To use this <literal>REVOKE</literal> syntax, you must have
+          the global <literal>CREATE USER</literal> privilege or the
+          <literal>UPDATE</literal> privilege for the
+          <literal>mysql</literal> database.
+        </para>
+
       </section>
 
       <section id="set-password">

Thread
svn commit - mysqldoc@docsrva: r1086 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul28 Jan