Author: paul
Date: 2007-10-26 05:35:30 +0200 (Fri, 26 Oct 2007)
New Revision: 8336
Log:
r26199@frost: paul | 2007-10-25 22:25:25 -0500
Missing version/platform information for MYSQL_OPT_WRITE_TIMEOUT. (Bug#31827)
Modified:
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-5.0/apis-c.xml
trunk/refman-5.1/apis-c.xml
trunk/refman-5.2/apis-c.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31592
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26198
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31592
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26199
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2007-10-26 03:35:18 UTC (rev 8335)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2007-10-26 03:35:30 UTC (rev 8336)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 0; 710 bytes
@@ -95116,6 +95116,15 @@
available.
</para>
+ <para>
+ As a result of this change, the
+ <literal>MYSQL_OPT_READ_TIMEOUT</literal> and
+ <literal>MYSQL_OPT_WRITE_TIMEOUT</literal> options for
+ <function role="capi">mysql_options()</function> now apply to
+ TCP/IP connections on all platforms. Previously, they applied
+ only to Windows.
+ </para>
+
</message>
</logentry>
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-10-26 03:35:18 UTC (rev 8335)
+++ trunk/refman-5.0/apis-c.xml 2007-10-26 03:35:30 UTC (rev 8336)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 576 bytes
@@ -5365,8 +5365,8 @@
</para>
<para>
- Timeout for writes to server (works currently only on
- Windows on TCP/IP connections).
+ Timeout for writes to server (works only for TCP/IP
+ connections, and only for Windows prior to MySQL 5.0.25).
</para>
</listitem>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-10-26 03:35:18 UTC (rev 8335)
+++ trunk/refman-5.1/apis-c.xml 2007-10-26 03:35:30 UTC (rev 8336)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 576 bytes
@@ -5425,8 +5425,8 @@
</para>
<para>
- Timeout for writes to server (works currently only on
- Windows on TCP/IP connections).
+ Timeout for writes to server (works only for TCP/IP
+ connections, and only for Windows prior to MySQL 5.1.12).
</para>
</listitem>
Modified: trunk/refman-5.2/apis-c.xml
===================================================================
--- trunk/refman-5.2/apis-c.xml 2007-10-26 03:35:18 UTC (rev 8335)
+++ trunk/refman-5.2/apis-c.xml 2007-10-26 03:35:30 UTC (rev 8336)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 5; 1297 bytes
@@ -5274,9 +5274,8 @@
<para>
Timeout for reads from server (works only for TCP/IP
- connections, and only for Windows prior to MySQL 5.1.12).
- You can this option so that a lost connection can be
- detected earlier than the TCP/IP
+ connections). You can this option so that a lost connection
+ can be detected earlier than the TCP/IP
<literal>Close_Wait_Timeout</literal> value of 10 minutes.
</para>
</listitem>
@@ -5376,8 +5375,8 @@
</para>
<para>
- Timeout for writes to server (works currently only on
- Windows on TCP/IP connections).
+ Timeout for writes to server (works only for TCP/IP
+ connections).
</para>
</listitem>
@@ -6771,6 +6770,7 @@
Asks the MySQL server to reload the grant tables. The connected
user must have the <literal>RELOAD</literal> privilege.
</para>
+
<remark role="note">
Deprecated as of 3.21.9.
</remark>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8336 - in trunk: . dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.2 | paul | 26 Oct |
