List:Internals« Previous MessageNext Message »
From:paul Date:November 2 2005 5:01pm
Subject:svn commit - mysqldoc@docsrva: r212 - in trunk: . refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2005-11-02 18:01:17 +0100 (Wed, 02 Nov 2005)
New Revision: 212

Log:
 r3270@frost:  paul | 2005-10-31 21:37:53 -0600
 Move --routines description from mysqlhotcopy to mysqldump.
 I seem to have put it in the wrong place initially. :-(


Modified:
   trunk/
   trunk/refman-5.0/client-side-scripts.xml
   trunk/refman-5.1/client-side-scripts.xml


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

Modified: trunk/refman-5.0/client-side-scripts.xml
===================================================================
--- trunk/refman-5.0/client-side-scripts.xml	2005-11-02 17:00:49 UTC (rev 211)
+++ trunk/refman-5.0/client-side-scripts.xml	2005-11-02 17:01:17 UTC (rev 212)
@@ -6041,6 +6041,39 @@
 
           <listitem>
             <para>
+              <option>--routines</option>, <option>-R</option>
+            </para>
+
+            <para>
+              Dump stored routines (functions and procedures) in the
+              dumped databases. The output generated by using
+              <option>---routines</option> contains <literal>CREATE
+              PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
+              statements to recreate the routines. However, these
+              statements do not include attributes such as the routine
+              definer or the creation and modification timestamps. This
+              means that when the routines are reloaded, they will be
+              created with the definer set to the reloading user and
+              timestamps equal to the reload time.
+            </para>
+
+            <para>
+              If you require routines to be recreated with their
+              original definer and timestamp attributes, do not use
+              <option>--routines</option>. Instead, dump and reload the
+              contents of the <literal>mysql.proc</literal> table
+              directly, using a MySQL account that has appropriate
+              privileges for the <literal>mysql</literal> database.
+            </para>
+
+            <para>
+              This option was added in MySQL 5.0.13. Before that, stored
+              routines are not dumped.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--set-charset</option>
             </para>
 
@@ -6674,39 +6707,6 @@
 
           <listitem>
             <para>
-              <option>--routines</option>, <option>-R</option>
-            </para>
-
-            <para>
-              Dump stored routines (functions and procedures) in the
-              dumped databases. The output generated by using
-              <option>---routines</option> contains <literal>CREATE
-              PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
-              statements to recreate the routines. However, these
-              statements do not include attributes such as the routine
-              definer or the creation and modification timestamps. This
-              means that when the routines are reloaded, they will be
-              created with the definer set to the reloading user and
-              timestamps equal to the reload time.
-            </para>
-
-            <para>
-              If you require routines to be recreated with their
-              original definer and timestamp attributes, do not use
-              <option>--routines</option>. Instead, dump and reload the
-              contents of the <literal>mysql.proc</literal> table
-              directly, using a MySQL account that has appropriate
-              privileges for the <literal>mysql</literal> database.
-            </para>
-
-            <para>
-              This option was added in MySQL 5.0.13. Before that, stored
-              routines are not dumped.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--socket=<replaceable>path</replaceable></option>,
               <option>-S <replaceable>path</replaceable></option>
             </para>

Modified: trunk/refman-5.1/client-side-scripts.xml
===================================================================
--- trunk/refman-5.1/client-side-scripts.xml	2005-11-02 17:00:49 UTC (rev 211)
+++ trunk/refman-5.1/client-side-scripts.xml	2005-11-02 17:01:17 UTC (rev 212)
@@ -5856,6 +5856,39 @@
 
           <listitem>
             <para>
+              <option>--routines</option>, <option>-R</option>
+            </para>
+
+            <para>
+              Dump stored routines (functions and procedures) in the
+              dumped databases. The output generated by using
+              <option>---routines</option> contains <literal>CREATE
+              PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
+              statements to recreate the routines. However, these
+              statements do not include attributes such as the routine
+              definer or the creation and modification timestamps. This
+              means that when the routines are reloaded, they will be
+              created with the definer set to the reloading user and
+              timestamps equal to the reload time.
+            </para>
+
+            <para>
+              If you require routines to be recreated with their
+              original definer and timestamp attributes, do not use
+              <option>--routines</option>. Instead, dump and reload the
+              contents of the <literal>mysql.proc</literal> table
+              directly, using a MySQL account that has appropriate
+              privileges for the <literal>mysql</literal> database.
+            </para>
+
+            <para>
+              This option was added in MySQL 5.1.2. Before that, stored
+              routines are not dumped.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--set-charset</option>
             </para>
 
@@ -6487,39 +6520,6 @@
 
           <listitem>
             <para>
-              <option>--routines</option>, <option>-R</option>
-            </para>
-
-            <para>
-              Dump stored routines (functions and procedures) in the
-              dumped databases. The output generated by using
-              <option>---routines</option> contains <literal>CREATE
-              PROCEDURE</literal> and <literal>CREATE FUNCTION</literal>
-              statements to recreate the routines. However, these
-              statements do not include attributes such as the routine
-              definer or the creation and modification timestamps. This
-              means that when the routines are reloaded, they will be
-              created with the definer set to the reloading user and
-              timestamps equal to the reload time.
-            </para>
-
-            <para>
-              If you require routines to be recreated with their
-              original definer and timestamp attributes, do not use
-              <option>--routines</option>. Instead, dump and reload the
-              contents of the <literal>mysql.proc</literal> table
-              directly, using a MySQL account that has appropriate
-              privileges for the <literal>mysql</literal> database.
-            </para>
-
-            <para>
-              This option was added in MySQL 5.1.2. Before that, stored
-              routines are not dumped.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--socket=<replaceable>path</replaceable></option>,
               <option>-S <replaceable>path</replaceable></option>
             </para>

Thread
svn commit - mysqldoc@docsrva: r212 - in trunk: . refman-5.0 refman-5.1paul2 Nov