List:Commits« Previous MessageNext Message »
From:jon Date:January 21 2006 3:59am
Subject:svn commit - mysqldoc@docsrva: r964 - in trunk: refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: jstephens
Date: 2006-01-21 04:59:36 +0100 (Sat, 21 Jan 2006)
New Revision: 964

Log:

Merge; fix typo.



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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-21 03:45:12 UTC (rev 963)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-21 03:59:36 UTC (rev 964)
@@ -5170,7 +5170,7 @@
         </para>
 
         <para>
-          The <literal>MyIAM</literal> storage engine supports all four
+          The <literal>MyISAM</literal> storage engine supports all four
           statements, so <command>mysqlcheck</command> can be used to
           perform all four operations on <literal>MyISAM</literal>
           tables. Other storage engines do not necessarily support all
@@ -6873,6 +6873,7 @@
 
           <listitem>
             <para>
+>>>>>>> .r962
               <option>--allowold</option>
             </para>
 
@@ -6940,6 +6941,17 @@
 
           <listitem>
             <para>
+              <option>--host=<replaceable>hostname</replaceable></option>,
+              <option>-h <replaceable>hostname</replaceable></option>
+            </para>
+            
+            <para>
+              Hostname for local server when connecting over TCP/IP.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--host=<replaceable>host_name</replaceable></option>,
               <option>-h <replaceable>host_name</replaceable></option>
             </para>
@@ -7032,12 +7044,15 @@
 
           <listitem>
             <para>
-              <option>--record_log_pos=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>
+                --record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
+              </option>
             </para>
-
+            
             <para>
-              Record master and slave status in the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Record slave and master status in the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-21 03:45:12 UTC (rev 963)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-21 03:59:36 UTC (rev 964)
@@ -5399,7 +5399,7 @@
         </para>
 
         <para>
-          The <literal>MyIAM</literal> storage engine supports all four
+          The <literal>MyISAM</literal> storage engine supports all four
           statements, so <command>mysqlcheck</command> can be used to
           perform all four operations on <literal>MyISAM</literal>
           tables. Other storage engines do not necessarily support all
@@ -7090,9 +7090,9 @@
             <para>
               <option>--addtodest</option>
             </para>
-
+            
             <para>
-              Do not rename target directory if it exists, just add
+              Do not rename target directory (if it exists); merely add
               files to it.
             </para>
           </listitem>
@@ -7165,8 +7165,8 @@
 
           <listitem>
             <para>
-              <option>--host=<replaceable>host_name</replaceable></option>,
-              <option>-h <replaceable>host_name</replaceable></option>
+              <option>--host=<replaceable>hostname</replaceable></option>,
+              <option>-h <replaceable>hostname</replaceable></option>
             </para>
 
             <para>
@@ -7255,12 +7255,13 @@
 
           <listitem>
             <para>
-              <option>--record_log_pos=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>--record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
 
             <para>
-              Record master and slave status in the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Record master and slave status in the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
 
@@ -8005,12 +8006,7 @@
               <xref linkend="password-security"/>.
             </para>
 
-            <para>
-              Specifying a password on the command line should be
-              considered insecure. See
-              <xref linkend="password-security"/>.
-            </para>
-          </listitem>
+            </listitem>
 
           <listitem>
             <para>

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-21 03:45:12 UTC (rev 963)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-21 03:59:36 UTC (rev 964)
@@ -5440,7 +5440,7 @@
         </para>
 
         <para>
-          The <literal>MyIAM</literal> storage engine supports all four
+          The <literal>MyISAM</literal> storage engine supports all four
           statements, so <command>mysqlcheck</command> can be used to
           perform all four operations on <literal>MyISAM</literal>
           tables. Other storage engines do not necessarily support all
@@ -7136,6 +7136,17 @@
               Display a help message and exit.
             </para>
           </listitem>
+          
+          <listitem>
+            <para>
+              <option>--addtodest</option>
+            </para>
+            
+            <para>
+              Do not rename target directory (if it exists); merely add
+              files to it.
+            </para>
+          </listitem>
 
           <listitem>
             <para>
@@ -7169,6 +7180,19 @@
               <replaceable>db_name.tbl_name</replaceable>.
             </para>
           </listitem>
+          
+          <listitem>
+            <para>
+              <option>
+                --chroot=<replaceable>directory</replaceable>
+              </option>
+            </para>
+            
+            <para>
+              Base directory of chroot jail in which
+              <command>mysqld</command> operates.
+            </para>
+          </listitem>
 
           <listitem>
             <para>
@@ -7213,6 +7237,17 @@
               Flush logs after all tables are locked.
             </para>
           </listitem>
+          
+          <listitem>
+            <para>
+              <option>--host=<replaceable>hostname</replaceable></option>,
+              <option>-h</option>
+            </para>
+            
+            <para>
+              Hostname for local server when connecting over TCP/IP.
+            </para>
+          </listitem>
 
           <listitem>
             <para>
@@ -7303,6 +7338,19 @@
               Be silent except for errors.
             </para>
           </listitem>
+          
+          <listitem>
+            <para>
+              <option>
+                --record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
+              </option>
+            </para>
+            
+            <para>
+              Record slave and master status in specified database and
+              table.
+            </para>
+          </listitem>
 
           <listitem>
             <para>
@@ -7325,6 +7373,27 @@
               expression.
             </para>
           </listitem>
+          
+          <listitem>
+            <para>
+              <option>--resetmaster</option>
+            </para>
+            
+            <para>
+              Reset the binlog once all tables are locked.
+            </para>
+          </listitem>
+          
+          <listitem>
+            <para>
+              <option>--resetslave</option>
+            </para>
+            
+            <para>
+              Reset the <filename>master.info</filename> file once all
+              tables are locked.
+            </para>
+          </listitem>
 
           <listitem>
             <para>

Thread
svn commit - mysqldoc@docsrva: r964 - in trunk: refman-4.1 refman-5.0 refman-5.1jon21 Jan