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

[paul]

Author: paul
Date: 2006-02-02 05:49:58 +0100 (Thu, 02 Feb 2006)
New Revision: 1177

Log:
 r7055@frost:  paul | 2006-02-01 22:48:53 -0600
 Add some more grant table/privilege stuff.


Modified:
   trunk/
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/triggers.xml


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

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-02-02 01:10:29 UTC (rev 1176)
+++ trunk/refman-5.1/database-administration.xml	2006-02-02 04:49:58 UTC (rev 1177)
@@ -12924,6 +12924,12 @@
             </row>
             <row>
               <entry/>
+              <entry><literal>Event_priv</literal></entry>
+              <entry><literal>Event_priv</literal></entry>
+              <entry><literal>Event_priv</literal></entry>
+            </row>
+            <row>
+              <entry/>
               <entry><literal>References_priv</literal></entry>
               <entry><literal>References_priv</literal></entry>
               <entry><literal>References_priv</literal></entry>
@@ -13041,7 +13047,8 @@
       </informaltable>
 
       <para>
-        The <literal>Trigger_priv</literal> column was added in MySQL
+        The <literal>Event_priv</literal> and
+        <literal>Trigger_priv</literal> columns were added in MySQL
         5.1.6.
       </para>
 
@@ -13557,6 +13564,11 @@
               <entry>databases or tables</entry>
             </row>
             <row>
+              <entry><literal>EVENT</literal></entry>
+              <entry><literal>Event_priv</literal></entry>
+              <entry>databases</entry>
+            </row>
+            <row>
               <entry><literal>ALTER</literal></entry>
               <entry><literal>Alter_priv</literal></entry>
               <entry>tables</entry>
@@ -13588,7 +13600,7 @@
             </row>
             <row>
               <entry><literal>TRIGGER</literal></entry>
-              <entry><literal>trigger_priv</literal></entry>
+              <entry><literal>Trigger_priv</literal></entry>
               <entry>tables</entry>
             </row>
             <row>
@@ -13685,8 +13697,8 @@
       </para>
 
       <para>
-        The <literal>TRIGGER</literal> privilege was added in MySQL
-        5.1.6.
+        The <literal>EVENT</literal> and
<literal>TRIGGER</literal>
+        privileges were added in MySQL 5.1.6.
       </para>
 
       <para>
@@ -13760,6 +13772,11 @@
       </para>
 
       <para>
+        The <literal>EVENT</literal> privilege enables you to set up
+        events for the event scheduler.
+      </para>
+
+      <para>
         The <literal>GRANT</literal> privilege enables you to give to
         other users those privileges that you yourself possess. It can
         be used for databases, tables, and stored routines.

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-02-02 01:10:29 UTC (rev 1176)
+++ trunk/refman-5.1/sql-syntax.xml	2006-02-02 04:49:58 UTC (rev 1177)
@@ -12160,14 +12160,14 @@
                 <entry>Enables use of <literal>DROP
TABLE</literal></entry>
               </row>
               <row>
+                <entry><literal>EVENT</literal></entry>
+                <entry>Enables creation of events for the event
scheduler</entry>
+              </row>
+              <row>
                 <entry><literal>EXECUTE</literal></entry>
                 <entry>Enables the user to run stored routines</entry>
               </row>
               <row>
-                <entry><literal>TRIGGER</literal></entry>
-                <entry>Enables the user to create or drop triggers</entry>
-              </row>
-              <row>
                 <entry><literal>FILE</literal></entry>
                 <entry>Enables use of <literal>SELECT ... INTO
OUTFILE</literal> and
                   <literal>LOAD DATA INFILE</literal></entry>
@@ -12233,6 +12233,10 @@
                   <literal>max_connections</literal> is reached</entry>
               </row>
               <row>
+                <entry><literal>TRIGGER</literal></entry>
+                <entry>Enables the user to create or drop triggers</entry>
+              </row>
+              <row>
                 <entry><literal>UPDATE</literal></entry>
                 <entry>Enables use of
<literal>UPDATE</literal></entry>
               </row>
@@ -12249,11 +12253,12 @@
         </informaltable>
 
         <para>
-          The <literal>TRIGGER</literal> privilege was added in MySQL
-          5.1.6. You must have this privilege for a table to create or
-          drop triggers for that table. (Previously, the
-          <literal>SUPER</literal> privilege was required to create or
-          drop triggers.)
+          The <literal>EVENT</literal> and
<literal>TRIGGER</literal>
+          privileges were added in MySQL 5.1.6. A trigger is associated
+          with a table, so to create or drop a trigger, you must have
+          the <literal>TRIGGER</literal> privilege for the table, not
+          the trigger. (Before MySQL 5.1.6, the <literal>SUPER</literal>
+          privilege was required to create or drop triggers.)
         </para>
 
         <para>
@@ -12888,10 +12893,6 @@
           </listitem>
 
           <listitem>
-            <remark role="todo">
-              Will we implement a CREATE TRIGGER privilege?
-            </remark>
-
             <para>
               MySQL does not support the standard SQL
               <literal>TRIGGER</literal> or
<literal>UNDER</literal>

Modified: trunk/refman-5.1/triggers.xml
===================================================================
--- trunk/refman-5.1/triggers.xml	2006-02-02 01:10:29 UTC (rev 1176)
+++ trunk/refman-5.1/triggers.xml	2006-02-02 04:49:58 UTC (rev 1177)
@@ -83,8 +83,9 @@
       database object that is associated with a table, and that
       activates when a particular event occurs for the table. Currently,
       <literal>CREATE TRIGGER</literal> requires the
-      <literal>TRIGGER</literal> privilege. (This requires the
-      <literal>SUPER</literal> privilege prior to MySQL 5.1.6.)
+      <literal>TRIGGER</literal> privilege for the table associated with
+      the trigger. (This statement requires the <literal>SUPER</literal>
+      privilege prior to MySQL 5.1.6.)
     </para>
 
     <para>
@@ -477,7 +478,9 @@
       optional. If the schema is omitted, the trigger is dropped from
       the default schema. <literal>DROP TRIGGER</literal> was added in
       MySQL 5.0.2. Its use requires the <literal>TRIGGER</literal>
-      privilege. (<literal>SUPER</literal> prior to MySQL 5.1.6.)
+      privilege for the table associated with the trigger. (This
+      statement requires the <literal>SUPER</literal> privilege prior to
+      MySQL 5.1.6.)
     </para>
 
     <remark role="help-description-end"/>