List:Commits« Previous MessageNext Message »
From:paul Date:January 4 2006 6:22pm
Subject:svn commit - mysqldoc@docsrva: r674 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-04 19:22:28 +0100 (Wed, 04 Jan 2006)
New Revision: 674

Log:
 r5835@frost:  paul | 2006-01-04 12:06:54 -0600
 Document --port-open-timeout option for mysqld. (Bug #15991)


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-common/news-5.0.xml
   trunk/refman-common/news-5.1.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-04 18:22:08 UTC (rev 673)
+++ trunk/refman-4.1/database-administration.xml	2006-01-04 18:22:28 UTC (rev 674)
@@ -1990,17 +1990,14 @@
 
         <indexterm type="function">
           <primary>command-line options</primary>
+          <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
-          <primary>options</primary>
-          <secondary>command-line</secondary>
+          <primary><command>mysqld</command></primary>
+          <secondary>command-line options</secondary>
         </indexterm>
 
-        <indexterm>
-          <primary>mysqld options</primary>
-        </indexterm>
-
         <para>
           When you start the <command>mysqld</command> server, you can
           specify program options using any of the methods described in

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-04 18:22:08 UTC (rev 673)
+++ trunk/refman-5.0/database-administration.xml	2006-01-04 18:22:28 UTC (rev 674)
@@ -2790,17 +2790,14 @@
 
         <indexterm type="function">
           <primary>command-line options</primary>
+          <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
-          <primary>options</primary>
-          <secondary>command-line</secondary>
+          <primary><command>mysqld</command></primary>
+          <secondary>command-line options</secondary>
         </indexterm>
 
-        <indexterm>
-          <primary>mysqld options</primary>
-        </indexterm>
-
         <para>
           When you start the <command>mysqld</command> server, you can
           specify program options using any of the methods described in
@@ -3793,6 +3790,22 @@
 
           <listitem>
             <para>
+              <option>--port-open-timeout=<replaceable>num</replaceable></option>
+            </para>
+
+            <para>
+              When the server is stopped, on some systems the TCP/IP
+              port might not become available immediately. If the server
+              is restarted quickly afterward, its attempt to reopen the
+              port can fail. This option indicates how many seconds the
+              server should wait for the TCP/IP port to become free if
+              it cannot be opened. The default is not to wait. This
+              option was added in MySQL 5.0.19.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--safe-mode</option>
             </para>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-04 18:22:08 UTC (rev 673)
+++ trunk/refman-5.1/database-administration.xml	2006-01-04 18:22:28 UTC (rev 674)
@@ -2774,17 +2774,14 @@
 
         <indexterm type="function">
           <primary>command-line options</primary>
+          <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
-          <primary>options</primary>
-          <secondary>command-line</secondary>
+          <primary><command>mysqld</command></primary>
+          <secondary>command-line options</secondary>
         </indexterm>
 
-        <indexterm>
-          <primary>mysqld options</primary>
-        </indexterm>
-
         <para>
           When you start the <command>mysqld</command> server, you can
           specify program options using any of the methods described in
@@ -3748,6 +3745,22 @@
 
           <listitem>
             <para>
+              <option>--port-open-timeout=<replaceable>num</replaceable></option>
+            </para>
+
+            <para>
+              When the server is stopped, on some systems the TCP/IP
+              port might not become available immediately. If the server
+              is restarted quickly afterward, its attempt to reopen the
+              port can fail. This option indicates how many seconds the
+              server should wait for the TCP/IP port to become free if
+              it cannot be opened. The default is not to wait. This
+              option was added in MySQL 5.1.5.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--safe-mode</option>
             </para>
 

Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml	2006-01-04 18:22:08 UTC (rev 673)
+++ trunk/refman-common/news-5.0.xml	2006-01-04 18:22:28 UTC (rev 674)
@@ -179,6 +179,15 @@
 
       <listitem>
         <para>
+          Added the <option>--port-open-timeout</option> option to
+          <command>mysqld</command> to control how many seconds the
+          server should wait for the TCP/IP port to become free if it
+          cannot be opened. (Bug #15591)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Two new Hungarian collations are included:
           <literal>utf8_hungarian_ci</literal> and
           <literal>ucs2_hungarian_ci</literal>. These support the

Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml	2006-01-04 18:22:08 UTC (rev 673)
+++ trunk/refman-common/news-5.1.xml	2006-01-04 18:22:28 UTC (rev 674)
@@ -57,6 +57,15 @@
 
       <listitem>
         <para>
+          Added the <option>--port-open-timeout</option> option to
+          <command>mysqld</command> to control how many seconds the
+          server should wait for the TCP/IP port to become free if it
+          cannot be opened. (Bug #15591)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Two new Hungarian collations are included:
           <literal>utf8_hungarian_ci</literal> and
           <literal>ucs2_hungarian_ci</literal>. These support the

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