MySQL Lists: commits: svn commit - mysqldoc@docsrva: r10972 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0

List:	Commits	« Previous Message Next Message »
From:	paul	Date:	June 18 2008 12:24am
Subject:	svn commit - mysqldoc@docsrva: r10972 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text
Author: paul
Date: 2008-06-18 00:24:08 +0200 (Wed, 18 Jun 2008)
New Revision: 10972

Log:
 r32102@frost:  paul | 2008-06-17 17:22:56 -0500
 Correct the description of MASTER_CONNECT_RETRY.
 (Bug#37455)


Modified:
   trunk/it/refman-5.1/sql-syntax.xml
   trunk/pt/refman-5.1/sql-syntax.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-6.0/sql-syntax.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32090
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31698
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32102
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31698


Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/it/refman-5.1/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1480 bytes

@@ -9199,7 +9199,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -25756,7 +25757,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>

@@ -25799,6 +25800,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,


Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/pt/refman-5.1/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1480 bytes

@@ -9199,7 +9199,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -25756,7 +25757,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>

@@ -25799,6 +25800,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,


Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/refman-4.1/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1470 bytes

@@ -6639,7 +6639,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -19542,7 +19543,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>
   | RELAY_LOG_FILE = '<replaceable>relay_log_name</replaceable>'

@@ -19584,6 +19585,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/refman-5.0/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1470 bytes

@@ -6801,7 +6801,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -22838,7 +22839,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>
   | RELAY_LOG_FILE = '<replaceable>relay_log_name</replaceable>'

@@ -22874,6 +22875,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/refman-5.1/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1471 bytes

@@ -9199,7 +9199,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -25756,7 +25757,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>

@@ -25799,6 +25800,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,


Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml	2008-06-17 16:28:46 UTC (rev 10971)
+++ trunk/refman-6.0/sql-syntax.xml	2008-06-17 22:24:08 UTC (rev 10972)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 2; 1471 bytes

@@ -9685,7 +9685,8 @@
       <remark role="help-topic" condition="REPLACE INTO"/>
 
       <remark role="help-keywords">
-        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET DEFAULT
+        REPLACE DELAYED LOW_PRIORITY INTO VALUES VALUE SELECT SET
+        DEFAULT
       </remark>
 
       <remark role="help-syntax-begin"/>

@@ -26446,7 +26447,7 @@
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
-  | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_CONNECT_RETRY = <replaceable>interval</replaceable>
   | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>

@@ -26486,6 +26487,11 @@
         </para>
 
         <para>
+          <literal>MASTER_CONNECT_RETRY</literal> specifies how many
+          seconds to wait between connect retries. The default is 60.
+        </para>
+
+        <para>
           The SSL options (<literal>MASTER_SSL</literal>,
           <literal>MASTER_SSL_CA</literal>,
           <literal>MASTER_SSL_CAPATH</literal>,
Thread
• svn commit - mysqldoc@docsrva: r10972 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0	paul	18 Jun