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

[paul]

Author: paul
Date: 2006-01-28 21:19:54 +0100 (Sat, 28 Jan 2006)
New Revision: 1084

Log:
 r6817@frost:  paul | 2006-01-28 14:18:55 -0600
 General revisions.


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

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:19:38 UTC (rev 1083)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:19:54 UTC (rev 1084)
@@ -12018,13 +12018,13 @@
         </para>
 
         <para>
-          The privileges for a table or column are formed additively as
-          the logical <literal>OR</literal> of the privileges at each of
-          the privilege levels. For example, if the
-          <literal>mysql.user</literal> table specifies that a user has
-          a global <literal>SELECT</literal> privilege, the privilege
-          cannot be denied by an entry at the database, table, or column
-          level.
+          The privileges for a table, column, or routine are formed
+          additively as the logical <literal>OR</literal> of the
+          privileges at each of the privilege levels. For example, if
+          the <literal>mysql.user</literal> table specifies that a user
+          has a global <literal>SELECT</literal> privilege, the
+          privilege cannot be denied by an entry at the database, table,
+          or column level.
         </para>
 
         <para>
@@ -12036,6 +12036,7 @@
 OR (database privileges AND host privileges)
 OR table privileges
 OR column privileges
+OR routine privileges
 </programlisting>
 
         <para>
@@ -12392,11 +12393,12 @@
         </para>
 
         <para>
-          Note that if you are using table or column privileges for even
-          one user, the server examines table and column privileges for
-          all users and this slows down MySQL a bit. Similarly, if you
-          limit the number of queries, updates, or connections for any
-          users, the server must monitor these values.
+          Note that if you are using table, column, or routine
+          privileges for even one user, the server examines table,
+          column, and routine privileges for all users and this slows
+          down MySQL a bit. Similarly, if you limit the number of
+          queries, updates, or connections for any users, the server
+          must monitor these values.
         </para>
 
         <indexterm>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:19:38 UTC (rev 1083)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:19:54 UTC (rev 1084)
@@ -12495,13 +12495,13 @@
         </para>
 
         <para>
-          The privileges for a table or column are formed additively as
-          the logical <literal>OR</literal> of the privileges at each of
-          the privilege levels. For example, if the
-          <literal>mysql.user</literal> table specifies that a user has
-          a global <literal>SELECT</literal> privilege, the privilege
-          cannot be denied by an entry at the database, table, or column
-          level.
+          The privileges for a table, column, or routine are formed
+          additively as the logical <literal>OR</literal> of the
+          privileges at each of the privilege levels. For example, if
+          the <literal>mysql.user</literal> table specifies that a user
+          has a global <literal>SELECT</literal> privilege, the
+          privilege cannot be denied by an entry at the database, table,
+          or column level.
         </para>
 
         <para>
@@ -12513,6 +12513,7 @@
 OR (database privileges AND host privileges)
 OR table privileges
 OR column privileges
+OR routine privileges
 </programlisting>
 
         <para>
@@ -12869,11 +12870,12 @@
         </para>
 
         <para>
-          Note that if you are using table or column privileges for even
-          one user, the server examines table and column privileges for
-          all users and this slows down MySQL a bit. Similarly, if you
-          limit the number of queries, updates, or connections for any
-          users, the server must monitor these values.
+          Note that if you are using table, column, or routine
+          privileges for even one user, the server examines table,
+          column, and routine privileges for all users and this slows
+          down MySQL a bit. Similarly, if you limit the number of
+          queries, updates, or connections for any users, the server
+          must monitor these values.
         </para>
 
         <indexterm>