Author: paul
Date: 2008-06-16 17:48:46 +0200 (Mon, 16 Jun 2008)
New Revision: 10960
Log:
r32056@frost: paul | 2008-06-16 10:49:06 -0500
Revise description for --open-files-limit.
(Bug#34563)
Modified:
trunk/it/refman-5.1/dba-core.xml
trunk/pt/refman-5.1/dba-core.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.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:32049
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:32056
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/dba-core.xml
===================================================================
--- trunk/it/refman-5.1/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/it/refman-5.1/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 2040 bytes
@@ -2183,19 +2183,23 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:open-files-limit"/>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_open_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
Modified: trunk/pt/refman-5.1/dba-core.xml
===================================================================
--- trunk/pt/refman-5.1/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/pt/refman-5.1/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 2040 bytes
@@ -2183,19 +2183,23 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:open-files-limit"/>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_open_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/refman-4.1/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 1959 bytes
@@ -1805,19 +1805,23 @@
</para>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/refman-5.0/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 2026 bytes
@@ -1995,19 +1995,23 @@
<para condition="dynamic:optvar:item" role="5.0:mysqld:open-files-limit"/>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/refman-5.1/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 2031 bytes
@@ -2183,19 +2183,23 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:open-files-limit"/>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_open_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-06-16 15:41:08 UTC (rev 10959)
+++ trunk/refman-6.0/dba-core.xml 2008-06-16 15:48:46 UTC (rev 10960)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 12; 2031 bytes
@@ -2159,19 +2159,23 @@
<para condition="dynamic:optvar:item" role="6.0:mysqld:open-files-limit"/>
<para>
- Change the number of file descriptors available to
- <command>mysqld</command>. If this option is not set or is
- set to 0, <command>mysqld</command> uses the value to
- reserve file descriptors with
- <literal>setrlimit()</literal>. If the value is 0,
- <command>mysqld</command> reserves
- <literal>max_connections×5</literal> or
- <literal>max_connections +
- table_open_cache×2</literal> files (whichever is
- larger). You should try increasing this value if
- <command>mysqld</command> gives you the error <literal>Too
- many open files</literal>.
+ Changes the number of file descriptors available to
+ <command>mysqld</command>. You should try increasing the
+ value of this option if <command>mysqld</command> gives you
+ the error <literal>Too many open files</literal>.
+ <command>mysqld</command> uses the option value to reserve
+ descriptors with <function>setrlimit()</function>. If the
+ requested number of file descriptors cannot be allocated,
+ <command>mysqld</command> writes a warning to the error log.
</para>
+
+ <para>
+ <command>mysqld</command> may attempt to allocate more than
+ the requested number of descriptors (if they are available),
+ using the values of <literal>max_connections</literal> and
+ <literal>table_open_cache</literal> to estimate whether more
+ descriptors will be needed.
+ </para>
</listitem>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10960 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 16 Jun |
