List:Commits« Previous MessageNext Message »
From:mcbrown Date:July 26 2007 5:34pm
Subject:svn commit - mysqldoc@docsrva: r7232 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2
View as plain text  
Author: mcbrown
Date: 2007-07-26 17:34:13 +0200 (Thu, 26 Jul 2007)
New Revision: 7232

Log:
Docs Bug #28946



Modified:
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.2/client-utility-programs.xml


Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2007-07-26 15:29:08 UTC (rev 7231)
+++ trunk/refman-4.1/client-utility-programs.xml	2007-07-26 15:34:13 UTC (rev 7232)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 23; 3407 bytes

@@ -10849,10 +10849,10 @@
               causes the slave to start from the correct position in the
               master's binary logs. If the option value is equal to 2,
               the <literal>CHANGE MASTER</literal> statement is written
-              as an SQL comment. (This is the default action if
-              <replaceable>value</replaceable> is omitted.)
-              <replaceable>value</replaceable> may be given as of MySQL
-              4.1.8; before that, do not specify an option value.
+              as an SQL comment. If the value is not specified, then the
+              default value is 1. <replaceable>value</replaceable> may
+              be given as of MySQL 4.1.8; before that, do not specify an
+              option value.
             </para>
 
             <para>

@@ -11688,24 +11688,23 @@
           <xref linkend="backup"/>, and
           <xref linkend="backup-strategy-example"/>.
         </para>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqldump</command> in the Knowledge Base article,
-            <ulink url="https://kb.mysql.com/view.php?id=5285"> How 
-            Can I Avoid Inserting Duplicate Rows From a Dump File?</ulink>. 
-            Access to the MySQL Knowledge Base collection of articles is one of the
-            advantages of subscribing to MySQL Enterprise. For more
-            information see
+            about <command>mysqldump</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5285">
+            How Can I Avoid Inserting Duplicate Rows From a Dump
+            File?</ulink>. Access to the MySQL Knowledge Base collection
+            of articles is one of the advantages of subscribing to MySQL
+            Enterprise. For more information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
-        
 
       </refsection>
 

@@ -12355,24 +12354,23 @@
 <programlisting>
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqlhotcopy</command> in the Knowledge Base
article,
-            <ulink url="https://kb.mysql.com/view.php?id=5919"> How
-              Does mysqlhotcopy Work?</ulink>. Access to the MySQL
+            about <command>mysqlhotcopy</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5919">
+            How Does mysqlhotcopy Work?</ulink>. Access to the MySQL
             Knowledge Base collection of articles is one of the
             advantages of subscribing to MySQL Enterprise. For more
             information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
-        
 
       </refsection>
 


Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2007-07-26 15:29:08 UTC (rev 7231)
+++ trunk/refman-5.0/client-utility-programs.xml	2007-07-26 15:34:13 UTC (rev 7232)
Changed blocks: 4, Lines Added: 29, Lines Deleted: 30; 4481 bytes

@@ -10651,14 +10651,16 @@
               <option>--skip-disable-keys</option>, and
               <option>--skip-add-locks</option> options.
             </para>
-            
+
             <para>
-              <emphasis>Note</emphasis>: Prior to release  5.0.48, 
-              this option did not create valid SQL if the database dump contained
-              views.  The recreation of views requires the creation and removal of
temporary tables
-              and this option suppressed the removal of those temporary tables. As a
workaround
-              use <option>--compress</option> with the
<option>--add-drop-table</option>
-              option and then manually adjust the dump file.
+              <emphasis>Note</emphasis>: Prior to release 5.0.48, this
+              option did not create valid SQL if the database dump
+              contained views. The recreation of views requires the
+              creation and removal of temporary tables and this option
+              suppressed the removal of those temporary tables. As a
+              workaround use <option>--compress</option> with the
+              <option>--add-drop-table</option> option and then manually
+              adjust the dump file.
             </para>
           </listitem>
 

@@ -11314,8 +11316,8 @@
               causes the slave to start from the correct position in the
               master's binary logs. If the option value is equal to 2,
               the <literal>CHANGE MASTER</literal> statement is written
-              as an SQL comment. (This is the default action if
-              <replaceable>value</replaceable> is omitted.)
+              as an SQL comment. If the value is not specified, then the
+              default value is 1.
             </para>
 
             <para>

@@ -12364,24 +12366,23 @@
           insufficient privileges. See
           <xref linkend="view-restrictions"/>.
         </para>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqldump</command> in the Knowledge Base article,
-            <ulink url="https://kb.mysql.com/view.php?id=5285"> How 
-              Can I Avoid Inserting Duplicate Rows From a Dump File?</ulink>. 
-            Access to the MySQL Knowledge Base collection of articles is one of the
-            advantages of subscribing to MySQL Enterprise. For more
-            information see
+            about <command>mysqldump</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5285">
+            How Can I Avoid Inserting Duplicate Rows From a Dump
+            File?</ulink>. Access to the MySQL Knowledge Base collection
+            of articles is one of the advantages of subscribing to MySQL
+            Enterprise. For more information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
-        
 
       </refsection>
 

@@ -13026,30 +13027,28 @@
 <programlisting>
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqlhotcopy</command> in the Knowledge Base
article,
-            <ulink url="https://kb.mysql.com/view.php?id=5919"> How
-              Does mysqlhotcopy Work?</ulink>. Access to the MySQL
+            about <command>mysqlhotcopy</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5919">
+            How Does mysqlhotcopy Work?</ulink>. Access to the MySQL
             Knowledge Base collection of articles is one of the
             advantages of subscribing to MySQL Enterprise. For more
             information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
-        
 
       </refsection>
 
     </refentry>
-    
-    
+
   </section>
 
   <section id="fake-id-for-mysqlimport-manpage-section-wrapper">


Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2007-07-26 15:29:08 UTC (rev 7231)
+++ trunk/refman-5.1/client-utility-programs.xml	2007-07-26 15:34:13 UTC (rev 7232)
Changed blocks: 3, Lines Added: 19, Lines Deleted: 20; 3114 bytes

@@ -11547,8 +11547,8 @@
               causes the slave to start from the correct position in the
               master's binary logs. If the option value is equal to 2,
               the <literal>CHANGE MASTER</literal> statement is written
-              as an SQL comment. (This is the default action if
-              <replaceable>value</replaceable> is omitted.)
+              as an SQL comment. If the value is not specified, then the
+              default value is 1.
             </para>
 
             <para>

@@ -12618,22 +12618,22 @@
           insufficient privileges. See
           <xref linkend="view-restrictions"/>.
         </para>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqldump</command> in the Knowledge Base article,
-            <ulink url="https://kb.mysql.com/view.php?id=5285"> How 
-              Can I Avoid Inserting Duplicate Rows From a Dump File?</ulink>. 
-            Access to the MySQL Knowledge Base collection of articles is one of the
-            advantages of subscribing to MySQL Enterprise. For more
-            information see
+            about <command>mysqldump</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5285">
+            How Can I Avoid Inserting Duplicate Rows From a Dump
+            File?</ulink>. Access to the MySQL Knowledge Base collection
+            of articles is one of the advantages of subscribing to MySQL
+            Enterprise. For more information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
 
       </refsection>

@@ -13279,24 +13279,23 @@
 <programlisting>
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
-        
+
         <formalpara role="mnmas-kb">
-          
+
           <title>MySQL Enterprise</title>
-          
+
           <para>
             MySQL Enterprise subscribers will find more information
-            about <command>mysqlhotcopy</command> in the Knowledge Base
article,
-            <ulink url="https://kb.mysql.com/view.php?id=5919"> How
-              Does mysqlhotcopy Work?</ulink>. Access to the MySQL
+            about <command>mysqlhotcopy</command> in the Knowledge Base
+            article, <ulink url="https://kb.mysql.com/view.php?id=5919">
+            How Does mysqlhotcopy Work?</ulink>. Access to the MySQL
             Knowledge Base collection of articles is one of the
             advantages of subscribing to MySQL Enterprise. For more
             information see
             <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
-          
+
         </formalpara>
-        
 
       </refsection>
 


Modified: trunk/refman-5.2/client-utility-programs.xml
===================================================================
--- trunk/refman-5.2/client-utility-programs.xml	2007-07-26 15:29:08 UTC (rev 7231)
+++ trunk/refman-5.2/client-utility-programs.xml	2007-07-26 15:34:13 UTC (rev 7232)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 797 bytes

@@ -11534,8 +11534,8 @@
               causes the slave to start from the correct position in the
               master's binary logs. If the option value is equal to 2,
               the <literal>CHANGE MASTER</literal> statement is written
-              as an SQL comment. (This is the default action if
-              <replaceable>value</replaceable> is omitted.)
+              as an SQL comment. If the value is not specified, then the
+              default value is 1.
             </para>
 
             <para>


Thread
svn commit - mysqldoc@docsrva: r7232 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2mcbrown26 Jul