List:Commits« Previous MessageNext Message »
From:paul Date:January 23 2006 9:27pm
Subject:svn commit - mysqldoc@docsrva: r1006 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-23 22:27:08 +0100 (Mon, 23 Jan 2006)
New Revision: 1006

Log:
 r2449@kite-hub:  paul | 2006-01-23 15:24:02 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/stored-procedures.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-23 21:26:53 UTC (rev 1005)
+++ trunk/refman-4.1/database-administration.xml	2006-01-23 21:27:08 UTC (rev 1006)
@@ -537,19 +537,6 @@
 
           <listitem>
             <para>
-              <option>--console</option>
-            </para>
-
-            <para>
-              Write the error log messages to stderr/stdout even if
-              <option>--log-error</option> is specified. On Windows,
-              <command>mysqld</command> does not close the console
-              screen if this option is used.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--character-sets-dir=<replaceable>path</replaceable></option>
             </para>
 
@@ -576,6 +563,18 @@
 
           <listitem>
             <para>
+              <option>--character-set-server=<replaceable>charset</replaceable></option>
+            </para>
+
+            <para>
+              Use <replaceable>charset</replaceable> as the default
+              server character set. This option is available as of MySQL
+              4.1.3. See <xref linkend="character-sets"/>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--chroot=<replaceable>path</replaceable></option>
             </para>
 
@@ -593,18 +592,32 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--collation-server=<replaceable>collation</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
-              server character set. This option is available as of MySQL
+              Use <replaceable>collation</replaceable> as the default
+              server collation. This option is available as of MySQL
               4.1.3. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
+              <option>--console</option>
+            </para>
+
+            <para>
+              (Windows only.) Write error log messages to
+              <literal>stderr</literal> and <literal>stdout</literal>
+              even if <option>--log-error</option> is specified.
+              <command>mysqld</command> does not close the console
+              window if this option is used.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--core-file</option>
             </para>
 
@@ -621,18 +634,6 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
-            </para>
-
-            <para>
-              Use <replaceable>collation</replaceable> as the default
-              server collation. This option is available as of MySQL
-              4.1.3. See <xref linkend="character-sets"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--datadir=<replaceable>path</replaceable>, -h
               <replaceable>path</replaceable></option>
             </para>
@@ -5150,6 +5151,8 @@
               detected by the <literal>crash-me</literal> test are
               dependent on this value. The default is large enough for
               normal operation. See <xref linkend="mysql-benchmarks"/>.
+              The default is 64KB before MySQL 4.0.10 and 192KB
+              thereafter.
             </para>
           </listitem>
 
@@ -5249,20 +5252,6 @@
             <para>
               This variable was added in MySQL 3.22.4.
             </para>
-
-            <para>
-              This variable is set by the <literal>SET TRANSACTION
-              ISOLATION LEVEL</literal> statement. See
-              <xref linkend="set-transaction"/>. If you set
-              <literal>tx_isolation</literal> level directly to an
-              isolation level name that contains a space, the name
-              should be enclosed within quotes, with the space replaced
-              by a dash. For example:
-            </para>
-
-<programlisting>
-SET tx_isolation = 'READ-COMMITTED';
-</programlisting>
           </listitem>
 
           <listitem>
@@ -5314,6 +5303,20 @@
               The default transaction isolation level. This variable was
               added in MySQL 4.0.3.
             </para>
+
+            <para>
+              This variable is set by the <literal>SET TRANSACTION
+              ISOLATION LEVEL</literal> statement. See
+              <xref linkend="set-transaction"/>. If you set
+              <literal>tx_isolation</literal> level directly to an
+              isolation level name that contains a space, the name
+              should be enclosed within quotes, with the space replaced
+              by a dash. For example:
+            </para>
+
+<programlisting>
+SET tx_isolation = 'READ-COMMITTED';
+</programlisting>
           </listitem>
 
           <listitem>
@@ -11152,9 +11155,16 @@
             whether to reject or allow incoming connections. For allowed
             connections, any privileges granted in the
             <literal>user</literal> table indicate the user's global
-            (superuser) privileges. These privileges apply to
-            <emphasis>all</emphasis> databases on the server.
+            (superuser) privileges. Any privilege granted in this table
+            applies to <emphasis>all</emphasis> databases on the server.
           </para>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: Because any global
+            privilege is considered a privilege for all databases, any
+            global privilege enables a user to see all database names
+            with <literal>SHOW DATABASES</literal>.
+          </para>
         </listitem>
 
         <listitem>
@@ -11427,16 +11437,22 @@
       </informaltable>
 
       <para>
+        Some releases of MySQL introduce changes to the structure of the
+        grant tables to add new privileges or features. Whenever you
+        update to a new version of MySQL, you should update your grant
+        tables to make sure that they have the current structure so that
+        you can take advantage of any new capabilities. See
+        <xref linkend="mysql-fix-privilege-tables"/>.
+      </para>
+
+      <para>
         The <literal>CREATE TEMPORARY TABLES</literal>,
         <literal>EXECUTE</literal>, <literal>LOCK TABLES</literal>,
         <literal>REPLICATION CLIENT</literal>, <literal>REPLICATION
         SLAVE</literal>, <literal>SHOW DATABASES</literal>, and
         <literal>SUPER</literal> privileges were added in MySQL 4.0.2.
         (<literal>EXECUTE</literal> is not used in any MySQL version
-        through the 4.1 release series.) To use these privileges when
-        upgrading from an earlier version of MySQL that does not have
-        them, you must upgrade your grant tables. See
-        <xref linkend="upgrading-grant-tables"/>.
+        through the 4.1 release series.)
       </para>
 
       <para>
@@ -11720,6 +11736,14 @@
           </para>
         </listitem>
 
+        <listitem>
+          <para>
+            A password applies globally to an account. You cannot
+            associate a password with a specific object such as a
+            database or table.
+          </para>
+        </listitem>
+
       </itemizedlist>
 
     </section>
@@ -12173,8 +12197,8 @@
         method that has better password protection during the connection
         process than in earlier versions. It is secure even if TCP/IP
         packets are sniffed or the <literal>mysql</literal> database is
-        captured. Password encryption is discussed further in
-        <xref linkend="password-hashing"/>.
+        captured. <xref linkend="password-hashing"/>, discusses password
+        encryption further.
       </para>
 
       <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-23 21:26:53 UTC (rev 1005)
+++ trunk/refman-5.0/database-administration.xml	2006-01-23 21:27:08 UTC (rev 1006)
@@ -560,20 +560,6 @@
 
           <listitem>
             <para>
-              <option>--console</option>
-            </para>
-
-            <para>
-              Write error log messages to <literal>stderr</literal> and
-              <literal>stdout</literal> even if
-              <option>--log-error</option> is specified. On Windows,
-              <command>mysqld</command> does not close the console
-              screen if this option is used.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--character-sets-dir=<replaceable>path</replaceable></option>
             </para>
 
@@ -599,6 +585,18 @@
 
           <listitem>
             <para>
+              <option>--character-set-server=<replaceable>charset</replaceable></option>
+            </para>
+
+            <para>
+              Use <replaceable>charset</replaceable> as the default
+              server character set. See
+              <xref linkend="character-sets"/>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--chroot=<replaceable>path</replaceable></option>
             </para>
 
@@ -614,18 +612,31 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--collation-server=<replaceable>collation</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
-              server character set. See
-              <xref linkend="character-sets"/>.
+              Use <replaceable>collation</replaceable> as the default
+              server collation. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
+              <option>--console</option>
+            </para>
+
+            <para>
+              (Windows only.) Write error log messages to
+              <literal>stderr</literal> and <literal>stdout</literal>
+              even if <option>--log-error</option> is specified.
+              <command>mysqld</command> does not close the console
+              window if this option is used.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--core-file</option>
             </para>
 
@@ -642,17 +653,6 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
-            </para>
-
-            <para>
-              Use <replaceable>collation</replaceable> as the default
-              server collation. See <xref linkend="character-sets"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--datadir=<replaceable>path</replaceable>, -h
               <replaceable>path</replaceable></option>
             </para>
@@ -5314,6 +5314,13 @@
               <literal>table_type</literal>. In MySQL &current-series;,
               <literal>storage_engine</literal> is the preferred name.
             </para>
+
+            <para>
+              The default storage engine (table type). To set the
+              storage engine at server startup, use the
+              <option>--default-storage-engine</option> option. See
+              <xref linkend="server-options"/>.
+            </para>
           </listitem>
 
           <listitem>
@@ -5402,10 +5409,10 @@
             </para>
 
             <para>
-              The default table type (storage engine). To set the table
-              type at server startup, use the
-              <option>--default-table-type</option> option. See
-              <xref linkend="server-options"/>.
+              This variable is a synonym for
+              <literal>storage_engine</literal>. In MySQL
+              &current-series;, <literal>storage_engine</literal> is the
+              preferred name.
             </para>
           </listitem>
 
@@ -5457,6 +5464,7 @@
               detected by the <literal>crash-me</literal> test are
               dependent on this value. The default is large enough for
               normal operation. See <xref linkend="mysql-benchmarks"/>.
+              The default is 192KB.
             </para>
           </listitem>
 
@@ -12703,11 +12711,6 @@
         control. The columns in these grant tables are shown here:
       </para>
 
-      <remark role="todo">
-        Add Alter_routine_priv, Create_routine_priv, Execute_priv to
-        host table after bug #8166 is fixed
-      </remark>
-
       <informaltable>
         <tgroup cols="4">
           <colspec colwidth="25*"/>
@@ -12806,19 +12809,16 @@
               <entry><literal>Show_view_priv</literal></entry>
             </row>
             <row>
-              <entry><remark role="todo">
-                  Create_routine_priv, Alter_routine_priv need to be
-                  added to host table, but that hasn't happened yet.
-                </remark></entry>
+              <entry/>
               <entry><literal>Create_routine_priv</literal></entry>
               <entry><literal>Create_routine_priv</literal></entry>
-              <entry/>
+              <entry><literal>Create_routine_priv</literal></entry>
             </row>
             <row>
               <entry/>
               <entry><literal>Alter_routine_priv</literal></entry>
               <entry><literal>Alter_routine_priv</literal></entry>
-              <entry/>
+              <entry><literal>Alter_routine_priv</literal></entry>
             </row>
             <row>
               <entry/>
@@ -12877,8 +12877,8 @@
             <row>
               <entry/>
               <entry><literal>Execute_priv</literal></entry>
-              <entry/>
-              <entry/>
+              <entry><literal>Execute_priv</literal></entry>
+              <entry><literal>Execute_priv</literal></entry>
             </row>
             <row>
               <entry/>
@@ -13279,9 +13279,18 @@
             whether to reject or allow incoming connections. For allowed
             connections, any privileges granted in the
             <literal>user</literal> table indicate the user's global
-            (superuser) privileges. These privileges apply to
-            <emphasis>all</emphasis> databases on the server.
+            (superuser) privileges. Any privilege granted in this table
+            applies to <emphasis>all</emphasis> databases on the server.
           </para>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: Because any global
+            privilege is considered a privilege for all databases, any
+            global privilege enables a user to see all database names
+            with <literal>SHOW DATABASES</literal> or by examining the
+            <literal>SCHEMATA</literal> table of
+            <literal>INFORMATION_SCHEMA</literal>.
+          </para>
         </listitem>
 
         <listitem>
@@ -13588,17 +13597,21 @@
       </informaltable>
 
       <para>
+        Some releases of MySQL introduce changes to the structure of the
+        grant tables to add new privileges or features. Whenever you
+        update to a new version of MySQL, you should update your grant
+        tables to make sure that they have the current structure so that
+        you can take advantage of any new capabilities. See
+        <xref linkend="mysql-fix-privilege-tables"/>.
+      </para>
+
+      <para>
         <literal>CREATE VIEW</literal> and <literal>SHOW VIEW</literal>
         were added in MySQL 5.0.1. <literal>CREATE USER</literal>,
         <literal>CREATE ROUTINE</literal>, and <literal>ALTER
         ROUTINE</literal> were added in MySQL 5.0.3. Although
         <literal>EXECUTE</literal> was present in MySQL 5.0.0, it did
-        not become operational until MySQL 5.0.3. To use these
-        privileges when upgrading from an earlier version of MySQL that
-        does not have them, you must upgrade your grant tables using the
-        <command>mysql_fix_privilege_tables</command> script provided
-        with the MySQL distribution. See
-        <xref linkend="upgrading-grant-tables"/>.
+        not become operational until MySQL 5.0.3.
       </para>
 
       <para>
@@ -13895,6 +13908,14 @@
           </para>
         </listitem>
 
+        <listitem>
+          <para>
+            A password applies globally to an account. You cannot
+            associate a password with a specific object such as a
+            database, table, or routine.
+          </para>
+        </listitem>
+
       </itemizedlist>
 
     </section>
@@ -14347,9 +14368,9 @@
         method (first implemented in MySQL 4.1) that has better password
         protection during the connection process than in earlier
         versions. It is secure even if TCP/IP packets are sniffed or the
-        <literal>mysql</literal> database is captured. Password
-        encryption is discussed further in
-        <xref linkend="password-hashing"/>.
+        <literal>mysql</literal> database is captured.
+        <xref linkend="password-hashing"/>, discusses password
+        encryption further.
       </para>
 
       <para>
@@ -14630,8 +14651,9 @@
         do so. This is where the privilege columns in the grant tables
         come into play. These privileges can come from any of the
         <literal>user</literal>, <literal>db</literal>,
-        <literal>host</literal>, <literal>tables_priv</literal>, or
-        <literal>columns_priv</literal> tables. (You may find it helpful
+        <literal>host</literal>, <literal>tables_priv</literal>,
+        <literal>columns_priv</literal>, or
+        <literal>procs_priv</literal> tables. (You may find it helpful
         to refer to <xref linkend="privileges"/>, which lists the
         columns present in each of the grant tables.)
       </para>
@@ -14650,7 +14672,7 @@
         privileges in the <literal>user</literal> table set to
         <literal>'N'</literal> and grant privileges at more specific
         levels only. You can grant privileges for particular databases,
-        tables, or columns.
+        tables, columns, or routines.
       </para>
 
       <indexterm>
@@ -14774,10 +14796,11 @@
       </indexterm>
 
       <para>
-        The <literal>tables_priv</literal> and
-        <literal>columns_priv</literal> tables grant table-specific and
-        column-specific privileges. Values in the scope columns of these
-        tables can take the following form:
+        The <literal>tables_priv</literal>
+        <literal>columns_priv</literal>, and
+        <literal>proc_priv</literal> tables grant table-specific,
+        column-specific, and routine-specific privileges. Values in the
+        scope columns of these tables can take the following forms:
       </para>
 
       <itemizedlist>
@@ -14810,8 +14833,9 @@
       </itemizedlist>
 
       <para>
-        The server sorts the <literal>tables_priv</literal> and
-        <literal>columns_priv</literal> tables based on the
+        The server sorts the <literal>tables_priv</literal>,
+        <literal>columns_priv</literal>, and
+        <literal>procs_priv</literal> tables based on the
         <literal>Host</literal>, <literal>Db</literal>, and
         <literal>User</literal> columns. This is similar to
         <literal>db</literal> table sorting, but simpler because only

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-23 21:26:53 UTC (rev 1005)
+++ trunk/refman-5.1/database-administration.xml	2006-01-23 21:27:08 UTC (rev 1006)
@@ -584,20 +584,6 @@
 
           <listitem>
             <para>
-              <option>--console</option>
-            </para>
-
-            <para>
-              Write error log messages to <literal>stderr</literal> and
-              <literal>stdout</literal> even if
-              <option>--log-error</option> is specified. On Windows,
-              <command>mysqld</command> does not close the console
-              screen if this option is used.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--character-sets-dir=<replaceable>path</replaceable></option>
             </para>
 
@@ -623,6 +609,18 @@
 
           <listitem>
             <para>
+              <option>--character-set-server=<replaceable>charset</replaceable></option>
+            </para>
+
+            <para>
+              Use <replaceable>charset</replaceable> as the default
+              server character set. See
+              <xref linkend="character-sets"/>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--chroot=<replaceable>path</replaceable></option>
             </para>
 
@@ -638,18 +636,31 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--collation-server=<replaceable>collation</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
-              server character set. See
-              <xref linkend="character-sets"/>.
+              Use <replaceable>collation</replaceable> as the default
+              server collation. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
+              <option>--console</option>
+            </para>
+
+            <para>
+              (Windows only.) Write error log messages to
+              <literal>stderr</literal> and <literal>stdout</literal>
+              even if <option>--log-error</option> is specified.
+              <command>mysqld</command> does not close the console
+              window if this option is used.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--core-file</option>
             </para>
 
@@ -666,17 +677,6 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
-            </para>
-
-            <para>
-              Use <replaceable>collation</replaceable> as the default
-              server collation. See <xref linkend="character-sets"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--datadir=<replaceable>path</replaceable>, -h
               <replaceable>path</replaceable></option>
             </para>
@@ -5351,6 +5351,13 @@
               <literal>table_type</literal>. In MySQL &current-series;,
               <literal>storage_engine</literal> is the preferred name.
             </para>
+
+            <para>
+              The default storage engine (table type). To set the
+              storage engine at server startup, use the
+              <option>--default-storage-engine</option> option. See
+              <xref linkend="server-options"/>.
+            </para>
           </listitem>
 
           <listitem>
@@ -5465,10 +5472,10 @@
             </para>
 
             <para>
-              The default table type (storage engine). To set the table
-              type at server startup, use the
-              <option>--default-table-type</option> option. See
-              <xref linkend="server-options"/>.
+              This variable is a synonym for
+              <literal>storage_engine</literal>. In MySQL
+              &current-series;, <literal>storage_engine</literal> is the
+              preferred name.
             </para>
           </listitem>
 
@@ -5520,6 +5527,7 @@
               detected by the <literal>crash-me</literal> test are
               dependent on this value. The default is large enough for
               normal operation. See <xref linkend="mysql-benchmarks"/>.
+              The default is 192KB.
             </para>
           </listitem>
 
@@ -12741,11 +12749,6 @@
         control. The columns in these grant tables are shown here:
       </para>
 
-      <remark role="todo">
-        Add Alter_routine_priv, Create_routine_priv, Execute_priv to
-        host table after bug #8166 is fixed
-      </remark>
-
       <informaltable>
         <tgroup cols="4">
           <colspec colwidth="25*"/>
@@ -12844,19 +12847,16 @@
               <entry><literal>Show_view_priv</literal></entry>
             </row>
             <row>
-              <entry><remark role="todo">
-                  Create_routine_priv, Alter_routine_priv need to be
-                  added to host table, but that hasn't happened yet.
-                </remark></entry>
+              <entry/>
               <entry><literal>Create_routine_priv</literal></entry>
               <entry><literal>Create_routine_priv</literal></entry>
-              <entry/>
+              <entry><literal>Create_routine_priv</literal></entry>
             </row>
             <row>
               <entry/>
               <entry><literal>Alter_routine_priv</literal></entry>
               <entry><literal>Alter_routine_priv</literal></entry>
-              <entry/>
+              <entry><literal>Alter_routine_priv</literal></entry>
             </row>
             <row>
               <entry/>
@@ -12915,8 +12915,8 @@
             <row>
               <entry/>
               <entry><literal>Execute_priv</literal></entry>
-              <entry/>
-              <entry/>
+              <entry><literal>Execute_priv</literal></entry>
+              <entry><literal>Execute_priv</literal></entry>
             </row>
             <row>
               <entry/>
@@ -13298,9 +13298,18 @@
             whether to reject or allow incoming connections. For allowed
             connections, any privileges granted in the
             <literal>user</literal> table indicate the user's global
-            (superuser) privileges. These privileges apply to
-            <emphasis>all</emphasis> databases on the server.
+            (superuser) privileges. Any privilege granted in this table
+            applies to <emphasis>all</emphasis> databases on the server.
           </para>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: Because any global
+            privilege is considered a privilege for all databases, any
+            global privilege enables a user to see all database names
+            with <literal>SHOW DATABASES</literal> or by examining the
+            <literal>SCHEMATA</literal> table of
+            <literal>INFORMATION_SCHEMA</literal>.
+          </para>
         </listitem>
 
         <listitem>
@@ -13607,21 +13616,19 @@
       </informaltable>
 
       <para>
-        To use the <literal>CREATE VIEW</literal>, <literal>SHOW
-        VIEW</literal>, <literal>CREATE ROUTINE</literal>,
-        <literal>ALTER ROUTINE</literal>, and <literal>EXECUTE</literal>
-        privileges when upgrading from an earlier version of MySQL that
-        does not have them, you must upgrade your grant tables using the
-        <command>mysql_fix_privilege_tables</command> script provided
-        with the MySQL distribution. See
-        <xref
-          linkend="upgrading-grant-tables"/>.
+        Some releases of MySQL introduce changes to the structure of the
+        grant tables to add new privileges or features. Whenever you
+        update to a new version of MySQL, you should update your grant
+        tables to make sure that they have the current structure so that
+        you can take advantage of any new capabilities. See
+        <xref linkend="mysql-fix-privilege-tables"/>.
       </para>
 
       <para>
-        To create or alter stored routines if binary logging is enabled,
-        you may also need the <literal>SUPER</literal> privilege, as
-        described in <xref linkend="stored-procedure-logging"/>.
+        To create or alter stored functions if binary logging is
+        enabled, you may also need the <literal>SUPER</literal>
+        privilege, as described in
+        <xref linkend="stored-procedure-logging"/>.
       </para>
 
       <para>
@@ -13912,6 +13919,14 @@
           </para>
         </listitem>
 
+        <listitem>
+          <para>
+            A password applies globally to an account. You cannot
+            associate a password with a specific object such as a
+            database, table, or routine.
+          </para>
+        </listitem>
+
       </itemizedlist>
 
     </section>
@@ -14364,9 +14379,9 @@
         method (first implemented in MySQL 4.1) that has better password
         protection during the connection process than in earlier
         versions. It is secure even if TCP/IP packets are sniffed or the
-        <literal>mysql</literal> database is captured. Password
-        encryption is discussed further in
-        <xref linkend="password-hashing"/>.
+        <literal>mysql</literal> database is captured.
+        <xref linkend="password-hashing"/>, discusses password
+        encryption further.
       </para>
 
       <para>
@@ -14647,8 +14662,9 @@
         do so. This is where the privilege columns in the grant tables
         come into play. These privileges can come from any of the
         <literal>user</literal>, <literal>db</literal>,
-        <literal>host</literal>, <literal>tables_priv</literal>, or
-        <literal>columns_priv</literal> tables. (You may find it helpful
+        <literal>host</literal>, <literal>tables_priv</literal>,
+        <literal>columns_priv</literal>, or
+        <literal>procs_priv</literal> tables. (You may find it helpful
         to refer to <xref linkend="privileges"/>, which lists the
         columns present in each of the grant tables.)
       </para>
@@ -14667,7 +14683,7 @@
         privileges in the <literal>user</literal> table set to
         <literal>'N'</literal> and grant privileges at more specific
         levels only. You can grant privileges for particular databases,
-        tables, or columns.
+        tables, columns, or routines.
       </para>
 
       <indexterm>
@@ -14791,10 +14807,11 @@
       </indexterm>
 
       <para>
-        The <literal>tables_priv</literal> and
-        <literal>columns_priv</literal> tables grant table-specific and
-        column-specific privileges. Values in the scope columns of these
-        tables can take the following form:
+        The <literal>tables_priv</literal>
+        <literal>columns_priv</literal>, and
+        <literal>proc_priv</literal> tables grant table-specific,
+        column-specific, and routine-specific privileges. Values in the
+        scope columns of these tables can take the following forms:
       </para>
 
       <itemizedlist>
@@ -14827,8 +14844,9 @@
       </itemizedlist>
 
       <para>
-        The server sorts the <literal>tables_priv</literal> and
-        <literal>columns_priv</literal> tables based on the
+        The server sorts the <literal>tables_priv</literal>,
+        <literal>columns_priv</literal>, and
+        <literal>procs_priv</literal> tables based on the
         <literal>Host</literal>, <literal>Db</literal>, and
         <literal>User</literal> columns. This is similar to
         <literal>db</literal> table sorting, but simpler because only

Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-01-23 21:26:53 UTC (rev 1005)
+++ trunk/refman-5.1/stored-procedures.xml	2006-01-23 21:27:08 UTC (rev 1006)
@@ -283,10 +283,11 @@
       <para>
         These statements create stored routines. To use them, it is
         necessary to have the <literal>CREATE ROUTINE</literal>
-        privilege. If binary logging is enabled, these statements might
-        may also require the <literal>SUPER</literal> privilege, as
-        described in <xref linkend="stored-procedure-logging"/>. MySQL
-        automatically grants the <literal>ALTER ROUTINE</literal> and
+        privilege. If binary logging is enabled, the <literal>CREATE
+        FUNCTION</literal> statement might may also require the
+        <literal>SUPER</literal> privilege, as described in
+        <xref linkend="stored-procedure-logging"/>. MySQL automatically
+        grants the <literal>ALTER ROUTINE</literal> and
         <literal>EXECUTE</literal> privileges to the routine creator.
       </para>
 
@@ -660,9 +661,9 @@
         stored procedure or function. You must have the <literal>ALTER
         ROUTINE</literal> privilege for the routine. (That privilege is
         granted automatically to the routine creator.) If binary logging
-        is enabled, this statement might also require the
-        <literal>SUPER</literal> privilege, as described in
-        <xref linkend="stored-procedure-logging"/>.
+        is enabled, the <literal>ALTER FUNCTION</literal> statement
+        might also require the <literal>SUPER</literal> privilege, as
+        described in <xref linkend="stored-procedure-logging"/>.
       </para>
 
       <para>

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