Author: paul
Date: 2008-12-02 03:57:56 +0100 (Tue, 02 Dec 2008)
New Revision: 12728
Log:
r36306@frost: paul | 2008-12-01 20:57:29 -0500
Reformat
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/errors-problems.xml
trunk/refman-4.1/news-3.23.xml
trunk/refman-4.1/news-4.0.xml
trunk/refman-4.1/optimization.xml
trunk/refman-4.1/programs-admin-util.xml
trunk/refman-4.1/replication-options-core.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-4.1/sql-syntax-data-definition.xml
trunk/refman-4.1/sql-syntax-prepared-statements.xml
trunk/refman-4.1/sql-syntax-server-administration.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/errors-problems.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/programs-admin-util-core.xml
trunk/refman-5.0/replication-implementation.xml
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.0/sql-syntax-data-definition.xml
trunk/refman-5.0/sql-syntax-prepared-statements.xml
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.0/stored-routines.xml
trunk/refman-5.1-maria/sql-syntax-server-administration.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/errors-problems-core.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/programs-admin-util-core.xml
trunk/refman-5.1/replication-implementation.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-5.1/sql-syntax-data-definition.xml
trunk/refman-5.1/sql-syntax-prepared-statements.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-5.1/stored-routines.xml
trunk/refman-6.0/data-types.xml
trunk/refman-6.0/dba-core.xml
trunk/refman-6.0/errors-problems.xml
trunk/refman-6.0/optimization.xml
trunk/refman-6.0/partitioning.xml
trunk/refman-6.0/programs-admin-util-core.xml
trunk/refman-6.0/replication-implementation.xml
trunk/refman-6.0/replication-options-core.xml
trunk/refman-6.0/se-innodb-core.xml
trunk/refman-6.0/sql-syntax-data-definition.xml
trunk/refman-6.0/sql-syntax-prepared-statements.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
trunk/refman-6.0/stored-routines.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36305
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36306
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 6; 1736 bytes
@@ -10144,8 +10144,8 @@
<para>
<literal>SET GLOBAL myisam_max_sort_file_size=DEFAULT</literal>
- set <literal role="sysvar">myisam_max_sort_file_size</literal> to an incorrect
- value.
+ set <literal role="sysvar">myisam_max_sort_file_size</literal>
+ to an incorrect value.
</para>
</message>
@@ -28193,7 +28193,8 @@
<para>
Unindexed <literal>ORDER BY</literal> did not work on short
<literal>utf32</literal> columns, or on <literal>utf16</literal>
- columns with a short <literal role="sysvar">max_sort_length</literal> value.
+ columns with a short
+ <literal role="sysvar">max_sort_length</literal> value.
</para>
</message>
@@ -45065,8 +45066,8 @@
<para>
<literal>SET GLOBAL myisam_max_sort_file_size=DEFAULT</literal>
- set <literal role="sysvar">myisam_max_sort_file_size</literal> to an incorrect
- value.
+ set <literal role="sysvar">myisam_max_sort_file_size</literal>
+ to an incorrect value.
</para>
</message>
@@ -63114,7 +63115,8 @@
<para>
Unindexed <literal>ORDER BY</literal> did not work on short
<literal>utf32</literal> columns, or on <literal>utf16</literal>
- columns with a short <literal role="sysvar">max_sort_length</literal> value.
+ columns with a short
+ <literal role="sysvar">max_sort_length</literal> value.
</para>
</message>
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 21, Lines Added: 60, Lines Deleted: 50; 10307 bytes
@@ -2131,7 +2131,8 @@
<command>mysqld</command>.
<literal>--log-slow-slave-statements</literal> causes slow
statements executed by a replication slave to be written to the
- slow query log; <literal role="sysvar">min_examined_row_limit</literal> can be
+ slow query log;
+ <literal role="sysvar">min_examined_row_limit</literal> can be
used to cause queries which examine fewer than the stated number
of rows not to be logged.
</para>
@@ -19542,8 +19543,8 @@
<para>
The value of <literal>max_connections_per_hour</literal> was
- capped by the unrelated <literal role="sysvar">max_user_connections</literal>
- setting.
+ capped by the unrelated
+ <literal role="sysvar">max_user_connections</literal> setting.
</para>
</message>
@@ -19562,8 +19563,8 @@
<para>
The value of <literal>max_connections_per_hour</literal> was
- capped by the unrelated <literal role="sysvar">max_user_connections</literal>
- setting.
+ capped by the unrelated
+ <literal role="sysvar">max_user_connections</literal> setting.
</para>
</message>
@@ -32263,10 +32264,10 @@
<message>
<para>
- Added the <literal role="sysvar">myisam_stats_method</literal>, which controls
- whether <literal>NULL</literal> values in indexes are considered
- the same or different when collecting statistics for
- <literal>MyISAM</literal> tables. This influences the query
+ Added the <literal role="sysvar">myisam_stats_method</literal>,
+ which controls whether <literal>NULL</literal> values in indexes
+ are considered the same or different when collecting statistics
+ for <literal>MyISAM</literal> tables. This influences the query
optimizer as described in
<xref linkend="myisam-index-statistics"/>.
</para>
@@ -35825,9 +35826,9 @@
<para>
Changed default value of
- <literal role="sysvar">myisam_data_pointer_size</literal> from 4 to 6. This
- allows us to avoid <literal>table is full</literal> errors for
- most cases.
+ <literal role="sysvar">myisam_data_pointer_size</literal> from 4
+ to 6. This allows us to avoid <literal>table is full</literal>
+ errors for most cases.
</para>
</message>
@@ -42153,8 +42154,8 @@
<para>
Attempting to repair a table having a fulltext index on a column
containing words whose length exceeded 21 characters and where
- <literal role="sysvar">myisam_repair_threads</literal> was greater than 1
- would crash the server.
+ <literal role="sysvar">myisam_repair_threads</literal> was
+ greater than 1 would crash the server.
</para>
</message>
@@ -57354,8 +57355,8 @@
<para>
<literal role="stmt">OPTIMIZE TABLE</literal> with
- <literal role="sysvar">myisam_repair_threads</literal> > 1 could result in
- <literal>MyISAM</literal> table corruption.
+ <literal role="sysvar">myisam_repair_threads</literal> > 1
+ could result in <literal>MyISAM</literal> table corruption.
</para>
</message>
@@ -61393,8 +61394,9 @@
<message>
<para>
- Insufficient memory (<literal role="sysvar">myisam_sort_buffer_size</literal>)
- could cause a server crash for several operations on
+ Insufficient memory
+ (<literal role="sysvar">myisam_sort_buffer_size</literal>) could
+ cause a server crash for several operations on
<literal>MyISAM</literal> tables: repair table, create index by
sort, repair by sort, parallel repair, bulk insert.
</para>
@@ -64455,8 +64457,9 @@
<message>
<para>
- The <literal role="sysvar">myisam_stats_method</literal> variable was
- mishandled when set from an option file or on the command line.
+ The <literal role="sysvar">myisam_stats_method</literal>
+ variable was mishandled when set from an option file or on the
+ command line.
</para>
</message>
@@ -66862,9 +66865,9 @@
<para>
Index corruption could occur in cases when
<literal role="sysvar">key_cache_block_size</literal> was not a
- multiple of <literal role="sysvar">myisam_block_size</literal> (for example,
- with <literal>key_cache_block_size = 1536</literal> and
- <literal>myisam_block_size = 1024</literal>).
+ multiple of <literal role="sysvar">myisam_block_size</literal>
+ (for example, with <literal>key_cache_block_size =
+ 1536</literal> and <literal>myisam_block_size = 1024</literal>).
</para>
</message>
@@ -87495,8 +87498,8 @@
<para>
Parallel repair (<command>myisamchk -p</command>,
- <literal role="sysvar">myisam_repair_threads</literal>) sometimes failed to
- repair a table.
+ <literal role="sysvar">myisam_repair_threads</literal>)
+ sometimes failed to repair a table.
</para>
</message>
@@ -89565,7 +89568,8 @@
<message>
<para>
- Setting the <literal role="sysvar">myisam_repair_threads</literal> system
+ Setting the
+ <literal role="sysvar">myisam_repair_threads</literal> system
variable to a value larger than 1 could cause corruption of
large <literal>MyISAM</literal> tables.
</para>
@@ -101829,8 +101833,8 @@
<message>
<para>
- New <literal role="sysvar">myisam_data_pointer_size</literal> system variable.
- See <xref linkend="server-system-variables"/>.
+ New <literal role="sysvar">myisam_data_pointer_size</literal>
+ system variable. See <xref linkend="server-system-variables"/>.
</para>
</message>
@@ -111026,10 +111030,10 @@
<message>
<para>
- Setting <literal role="sysvar">myisam_repair_threads</literal> caused any
- repair operation on a <literal>MyISAM</literal> table to fail to
- update the cardinality of indexes, instead making them always
- equal to 1.
+ Setting <literal role="sysvar">myisam_repair_threads</literal>
+ caused any repair operation on a <literal>MyISAM</literal> table
+ to fail to update the cardinality of indexes, instead making
+ them always equal to 1.
</para>
</message>
@@ -116930,13 +116934,14 @@
<message>
<para>
- Added the global <literal role="sysvar">max_prepared_stmt_count</literal>
- system variable to limit the total number of prepared statements
- in the server. This limits the potential for denial-of-service
- attacks based on running the server out of memory by preparing
- huge numbers of statements. The current number of prepared
- statements is available through the
- <literal>prepared_stmt_count</literal> system variable.
+ Added the global
+ <literal role="sysvar">max_prepared_stmt_count</literal> system
+ variable to limit the total number of prepared statements in the
+ server. This limits the potential for denial-of-service attacks
+ based on running the server out of memory by preparing huge
+ numbers of statements. The current number of prepared statements
+ is available through the <literal>prepared_stmt_count</literal>
+ system variable.
</para>
</message>
@@ -125634,8 +125639,9 @@
<message>
<para>
- If <literal role="sysvar">max_join_size</literal> was set, a query containing
- a subquery that exceeded the examined-rows limit could hang.
+ If <literal role="sysvar">max_join_size</literal> was set, a
+ query containing a subquery that exceeded the examined-rows
+ limit could hang.
</para>
</message>
@@ -126340,7 +126346,8 @@
<message>
<para>
- Added the <literal role="sysvar">myisam_use_mmap</literal> system variable.
+ Added the <literal role="sysvar">myisam_use_mmap</literal>
+ system variable.
</para>
</message>
@@ -127195,7 +127202,8 @@
<message>
<para>
- The values of the <literal role="sysvar">max_sort_length</literal>,
+ The values of the
+ <literal role="sysvar">max_sort_length</literal>,
<literal>sql_mode</literal>, and
<literal role="sysvar">group_concat_max_len</literal> system
variables now are stored in the query cache with other query
@@ -135636,7 +135644,8 @@
<message>
<para>
- WIth small values of <literal role="sysvar">myisam_sort_buffer_size</literal>,
+ WIth small values of
+ <literal role="sysvar">myisam_sort_buffer_size</literal>,
<literal role="stmt">REPAIR TABLE</literal> for
<literal>MyISAM</literal> tables could cause a server crash.
</para>
@@ -136995,9 +137004,9 @@
<para>
For <literal role="sysvar">join_buffer_size</literal>,
<literal>sort_buffer_size</literal>, and
- <literal role="sysvar">myisam_sort_buffer_size</literal>, values are
- limited to 4GB on all platforms. Larger values are truncated
- to 4GB with a warning.
+ <literal role="sysvar">myisam_sort_buffer_size</literal>,
+ values are limited to 4GB on all platforms. Larger values
+ are truncated to 4GB with a warning.
</para>
</listitem>
@@ -137043,9 +137052,10 @@
<para>
For <literal role="sysvar">join_buffer_size</literal>,
<literal>sort_buffer_size</literal>, and
- <literal role="sysvar">myisam_sort_buffer_size</literal>, values larger
- than 4GB are allowed on 64-bit platforms (except Windows,
- for which large values are truncated to 4GB with a warning).
+ <literal role="sysvar">myisam_sort_buffer_size</literal>,
+ values larger than 4GB are allowed on 64-bit platforms
+ (except Windows, for which large values are truncated to 4GB
+ with a warning).
</para>
</listitem>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/data-types.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 8; 2334 bytes
@@ -5127,10 +5127,11 @@
<listitem>
<para>
- Only the first <literal role="sysvar">max_sort_length</literal> bytes of
+ Only the first
+ <literal role="sysvar">max_sort_length</literal> bytes of
the column are used when sorting. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024. This value can
- be changed using the
+ <literal role="sysvar">max_sort_length</literal> is 1024.
+ This value can be changed using the
<option>--max_sort_length=<replaceable>N</replaceable></option>
option when starting the <command>mysqld</command> server.
See <xref linkend="server-system-variables"/>.
@@ -5139,8 +5140,8 @@
<para>
As of MySQL 4.0.3, you can make more bytes significant in
sorting or grouping by increasing the value of
- <literal role="sysvar">max_sort_length</literal> at runtime. Any client
- can change the value of its session
+ <literal role="sysvar">max_sort_length</literal> at runtime.
+ Any client can change the value of its session
<literal role="sysvar">max_sort_length</literal> variable:
</para>
@@ -5156,9 +5157,9 @@
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> column containing long
values when you want more than
- <literal role="sysvar">max_sort_length</literal> bytes to be significant
- is to convert the column value into a fixed-length object.
- The standard way to do this is with the
+ <literal role="sysvar">max_sort_length</literal> bytes to be
+ significant is to convert the column value into a
+ fixed-length object. The standard way to do this is with the
<literal role="func">SUBSTRING()</literal> function. For
example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/dba-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 11, Lines Added: 52, Lines Deleted: 44; 9415 bytes
@@ -5443,15 +5443,16 @@
<para>
Do not allow <literal role="stmt">SELECT</literal>
statements that probably need to examine more than
- <literal role="sysvar">max_join_size</literal> rows (for single-table
- statements) or row combinations (for multiple-table
- statements) or that are likely to do more than
- <literal role="sysvar">max_join_size</literal> disk seeks. By setting this
- value, you can catch <literal role="stmt">SELECT</literal>
- statements where keys are not used properly and that would
- probably take a long time. Set it if your users tend to
- perform joins that lack a <literal>WHERE</literal> clause,
- that take a long time, or that return millions of rows.
+ <literal role="sysvar">max_join_size</literal> rows (for
+ single-table statements) or row combinations (for
+ multiple-table statements) or that are likely to do more
+ than <literal role="sysvar">max_join_size</literal> disk
+ seeks. By setting this value, you can catch
+ <literal role="stmt">SELECT</literal> statements where keys
+ are not used properly and that would probably take a long
+ time. Set it if your users tend to perform joins that lack a
+ <literal>WHERE</literal> clause, that take a long time, or
+ that return millions of rows.
</para>
<para>
@@ -5460,8 +5461,8 @@
<literal role="sysvar">sql_big_selects</literal> to
<literal>0</literal>. If you set the
<literal role="sysvar">sql_big_selects</literal> value
- again, the <literal role="sysvar">max_join_size</literal> variable is
- ignored.
+ again, the <literal role="sysvar">max_join_size</literal>
+ variable is ignored.
</para>
<para>
@@ -5546,16 +5547,19 @@
the current log file size to exceed the value of this
variable, the slave rotates the relay logs (closes the
current file and opens the next one). If
- <literal role="sysvar">max_relay_log_size</literal> is 0, the server uses
+ <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the server uses
<literal role="sysvar">max_binlog_size</literal> for both
the binary log and the relay log. If
- <literal role="sysvar">max_relay_log_size</literal> is greater than 0, it
- constrains the size of the relay log, which enables you to
- have different sizes for the two logs. You must set
- <literal role="sysvar">max_relay_log_size</literal> to between 4096 bytes
- and 1GB (inclusive), or to <literal>0</literal>. The default
- value is <literal>0</literal>. This variable was added in
- MySQL 4.0.14. See
+ <literal role="sysvar">max_relay_log_size</literal> is
+ greater than 0, it constrains the size of the relay log,
+ which enables you to have different sizes for the two logs.
+ You must set
+ <literal role="sysvar">max_relay_log_size</literal> to
+ between 4096 bytes and 1GB (inclusive), or to
+ <literal>0</literal>. The default value is
+ <literal>0</literal>. This variable was added in MySQL
+ 4.0.14. See
<xref linkend="replication-implementation-details"/>.
</para>
</listitem>
@@ -5608,8 +5612,8 @@
The number of bytes to use when sorting
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> values. Only the first
- <literal role="sysvar">max_sort_length</literal> bytes of each value are
- used; the rest are ignored.
+ <literal role="sysvar">max_sort_length</literal> bytes of
+ each value are used; the rest are ignored.
</para>
</listitem>
@@ -6220,9 +6224,9 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 4.1.19. In MySQL 4.1.23, it
- was converted to the global
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 4.1.19.
+ In MySQL 4.1.23, it was converted to the global
<literal>Prepared_stmt_count</literal> status variable.
</para>
</listitem>
@@ -7972,14 +7976,16 @@
likely to take a very long time to execute (that is,
statements for which the optimizer estimates that the number
of examined rows exceeds the value of
- <literal role="sysvar">max_join_size</literal>). This is useful when an
- inadvisable <literal>WHERE</literal> statement has been
- issued. The default value for a new connection is 1, which
- allows all <literal role="stmt">SELECT</literal> statements.
+ <literal role="sysvar">max_join_size</literal>). This is
+ useful when an inadvisable <literal>WHERE</literal>
+ statement has been issued. The default value for a new
+ connection is 1, which allows all
+ <literal role="stmt">SELECT</literal> statements.
</para>
<para>
- If you set the <literal role="sysvar">max_join_size</literal> system
+ If you set the
+ <literal role="sysvar">max_join_size</literal> system
variable to a value other than <literal>DEFAULT</literal>,
<literal role="sysvar">sql_big_selects</literal> is set to
0.
@@ -8523,7 +8529,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following
two statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
@@ -9664,8 +9671,8 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 4.1.23.
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 4.1.23.
</para>
</listitem>
@@ -13351,8 +13358,8 @@
<para>
If you want to restrict the number of connections allowed to
a single account, you can do so by setting the
- <literal role="sysvar">max_user_connections</literal> variable in
- <command>mysqld</command>. The
+ <literal role="sysvar">max_user_connections</literal>
+ variable in <command>mysqld</command>. The
<literal role="stmt">GRANT</literal> statement also supports
resource control options for limiting the extent of server
use allowed to an account. See <xref linkend="grant"/>.
@@ -18321,13 +18328,14 @@
<para>
Before MySQL 4.0.2, the only available method for limiting use
of MySQL server resources is to set the
- <literal role="sysvar">max_user_connections</literal> system variable to a
- non-zero value. But that method is strictly global. It does not
- allow for management of individual accounts. Also, it limits
- only the number of simultaneous connections made using a single
- account, not what a client can do once connected. Both types of
- control are of interest to many MySQL administrators,
- particularly those for Internet Service Providers.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable to a non-zero value. But that method is strictly
+ global. It does not allow for management of individual accounts.
+ Also, it limits only the number of simultaneous connections made
+ using a single account, not what a client can do once connected.
+ Both types of control are of interest to many MySQL
+ administrators, particularly those for Internet Service
+ Providers.
</para>
<para>
@@ -18389,9 +18397,9 @@
limits are stored in the <literal>max_questions</literal>,
<literal>max_updates</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_user_connections</literal> columns. If your
- <literal>user</literal> table does not have these columns, it
- must be upgraded; see
+ <literal role="sysvar">max_user_connections</literal> columns.
+ If your <literal>user</literal> table does not have these
+ columns, it must be upgraded; see
<xref linkend="mysql-fix-privilege-tables"/>.
</para>
Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/errors-problems.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 15; 2760 bytes
@@ -1921,14 +1921,15 @@
<para>
To change the default size limit for
<literal>MyISAM</literal> data and index table files, set
- the <literal role="sysvar">myisam_data_pointer_size</literal>, which
- sets the number of bytes used for internal row pointers.
- The value is used to set the pointer size for new tables
- if you do not specify the <literal>MAX_ROWS</literal>
- option. The value of
- <literal role="sysvar">myisam_data_pointer_size</literal> can be from 2
- to 7. A value of 4 allows table files up to 4GB; a value
- of 6 allows table files up to 256TB.
+ the
+ <literal role="sysvar">myisam_data_pointer_size</literal>,
+ which sets the number of bytes used for internal row
+ pointers. The value is used to set the pointer size for
+ new tables if you do not specify the
+ <literal>MAX_ROWS</literal> option. The value of
+ <literal role="sysvar">myisam_data_pointer_size</literal>
+ can be from 2 to 7. A value of 4 allows table files up to
+ 4GB; a value of 6 allows table files up to 256TB.
</para>
<para>
@@ -5839,13 +5840,13 @@
<quote>reliably</quote> be used in <literal>GROUP
BY</literal>, <literal>ORDER BY</literal> or
<literal>DISTINCT</literal>. Only the first
- <literal role="sysvar">max_sort_length</literal> bytes are used when
- comparing <literal role="type">BLOB</literal> values in
- these cases. The default value of
- <literal role="sysvar">max_sort_length</literal> value is 1024 and can
- be changed at server startup time. As of MySQL 4.0.3, it
- can be changed at runtime. For older versions, a
- workaround is to use a substring. For example:
+ <literal role="sysvar">max_sort_length</literal> bytes are
+ used when comparing <literal role="type">BLOB</literal>
+ values in these cases. The default value of
+ <literal role="sysvar">max_sort_length</literal> value is
+ 1024 and can be changed at server startup time. As of
+ MySQL 4.0.3, it can be changed at runtime. For older
+ versions, a workaround is to use a substring. For example:
</para>
<programlisting>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/news-3.23.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 1126 bytes
@@ -3525,8 +3525,8 @@
<listitem>
<para>
- Added <literal role="sysvar">max_user_connections</literal> variable to
- <command>mysqld</command>.
+ Added <literal role="sysvar">max_user_connections</literal>
+ variable to <command>mysqld</command>.
</para>
</listitem>
@@ -7594,9 +7594,10 @@
<listitem>
<para>
- Added <literal role="sysvar">max_write_lock_count</literal> variable to
- <command>mysqld</command> to force a <literal>READ</literal>
- lock after a certain number of <literal>WRITE</literal> locks.
+ Added <literal role="sysvar">max_write_lock_count</literal>
+ variable to <command>mysqld</command> to force a
+ <literal>READ</literal> lock after a certain number of
+ <literal>WRITE</literal> locks.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/news-4.0.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 8, Lines Added: 24, Lines Deleted: 17; 4120 bytes
@@ -703,8 +703,9 @@
<para>
Attempting to repair a table having a fulltext index on a
column containing words whose length exceeded 21 characters
- and where <literal role="sysvar">myisam_repair_threads</literal> was greater
- than 1 would crash the server. (Bug #11684)
+ and where
+ <literal role="sysvar">myisam_repair_threads</literal> was
+ greater than 1 would crash the server. (Bug #11684)
</para>
</listitem>
@@ -2409,8 +2410,9 @@
<listitem>
<para>
- Added <literal role="sysvar">max_insert_delayed_threads</literal> system
- variable as a synonym for
+ Added
+ <literal role="sysvar">max_insert_delayed_threads</literal>
+ system variable as a synonym for
<literal role="sysvar">max_delayed_threads</literal>.
</para>
</listitem>
@@ -2622,8 +2624,9 @@
<para>
Fixed core dump crash in replication during relay-log switch
when the relay log went over
- <literal role="sysvar">max_relay_log_size</literal> and the slave thread did
- a <literal>flush_io_cache()</literal> at the same time.
+ <literal role="sysvar">max_relay_log_size</literal> and the
+ slave thread did a <literal>flush_io_cache()</literal> at the
+ same time.
</para>
</listitem>
@@ -2684,7 +2687,8 @@
<listitem>
<para>
Fixed a bug in parallel repair (<command>myisamchk
- -p</command>, <literal role="sysvar">myisam_repair_threads</literal>) -
+ -p</command>,
+ <literal role="sysvar">myisam_repair_threads</literal>) -
sometimes repair process failed to repair a table. (Bug #1334)
</para>
</listitem>
@@ -4945,10 +4949,10 @@
<listitem>
<para>
- Added thread-specific <literal role="sysvar">max_seeks_for_key</literal>
- variable that can be used to force the optimizer to use keys
- instead of table scans even if the cardinality of the index is
- low.
+ Added thread-specific
+ <literal role="sysvar">max_seeks_for_key</literal> variable
+ that can be used to force the optimizer to use keys instead of
+ table scans even if the cardinality of the index is low.
</para>
</listitem>
@@ -5035,10 +5039,11 @@
<listitem>
<para>
- Added <literal role="sysvar">max_relay_log_size</literal> variable; the
- relay log is rotated automatically when its size exceeds
- <literal role="sysvar">max_relay_log_size</literal>. But if
- <literal role="sysvar">max_relay_log_size</literal> is 0 (the default),
+ Added <literal role="sysvar">max_relay_log_size</literal>
+ variable; the relay log is rotated automatically when its size
+ exceeds <literal role="sysvar">max_relay_log_size</literal>.
+ But if <literal role="sysvar">max_relay_log_size</literal> is
+ 0 (the default),
<literal role="sysvar">max_binlog_size</literal> is used (as
in older versions).
<literal role="sysvar">max_binlog_size</literal> still applies
@@ -5186,7 +5191,8 @@
<listitem>
<para>
- Fixed a problem with <literal role="sysvar">max_user_connections</literal>.
+ Fixed a problem with
+ <literal role="sysvar">max_user_connections</literal>.
</para>
</listitem>
@@ -5506,7 +5512,8 @@
<listitem>
<para>
Added multi-threaded <literal>MyISAM</literal> repair
- optimization and <literal role="sysvar">myisam_repair_threads</literal>
+ optimization and
+ <literal role="sysvar">myisam_repair_threads</literal>
variable to enable it. See
<xref linkend="server-system-variables"/>.
</para>
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/optimization.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 10, Lines Added: 45, Lines Deleted: 36; 8049 bytes
@@ -1594,8 +1594,8 @@
of the <literal role="stmt">EXPLAIN</literal> output. This
should tell you roughly how many rows MySQL must examine to
execute the query. If you restrict queries with the
- <literal role="sysvar">max_join_size</literal> system variable, this row
- product also is used to determine which multiple-table
+ <literal role="sysvar">max_join_size</literal> system variable,
+ this row product also is used to determine which multiple-table
<literal role="stmt">SELECT</literal> statements to execute and
which to abort. See <xref linkend="server-parameters"/>.
</para>
@@ -3461,16 +3461,18 @@
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
tuple does not exceed the value of the
- <literal role="sysvar">max_length_for_sort_data</literal> system variable. (A
- symptom of setting the value of this variable too high is that
- you should see high disk activity and low CPU activity.)
+ <literal role="sysvar">max_length_for_sort_data</literal> system
+ variable. (A symptom of setting the value of this variable too
+ high is that you should see high disk activity and low CPU
+ activity.)
</para>
<para>
For slow queries for which <literal>filesort</literal> is not
used, you might try lowering
- <literal role="sysvar">max_length_for_sort_data</literal> to a value that is
- appropriate to trigger a <literal>filesort</literal>.
+ <literal role="sysvar">max_length_for_sort_data</literal> to a
+ value that is appropriate to trigger a
+ <literal>filesort</literal>.
</para>
<para>
@@ -5359,12 +5361,13 @@
<para>
Starting from MySQL 3.23.7, you can start
<command>mysqld</command> with a low value for the
- <literal role="sysvar">max_write_lock_count</literal> system variable to
- force MySQL to temporarily elevate the priority of all
- <literal role="stmt">SELECT</literal> statements that are
- waiting for a table after a specific number of inserts to
- the table occur. This allows <literal>READ</literal> locks
- after a certain number of <literal>WRITE</literal> locks.
+ <literal role="sysvar">max_write_lock_count</literal> system
+ variable to force MySQL to temporarily elevate the priority
+ of all <literal role="stmt">SELECT</literal> statements that
+ are waiting for a table after a specific number of inserts
+ to the table occur. This allows <literal>READ</literal>
+ locks after a certain number of <literal>WRITE</literal>
+ locks.
</para>
</listitem>
@@ -7284,8 +7287,9 @@
<para>
For <literal>MyISAM</literal> tables, you have some control over
collection of table statistics by means of the
- <literal role="sysvar">myisam_stats_method</literal> system variable. This
- variable has two possible values, which differ as follows:
+ <literal role="sysvar">myisam_stats_method</literal> system
+ variable. This variable has two possible values, which differ as
+ follows:
</para>
<itemizedlist>
@@ -7346,9 +7350,9 @@
</para>
<para>
- The <literal role="sysvar">myisam_stats_method</literal> system variable has
- global and session values. Setting the global value affects
- <literal>MyISAM</literal> statistics collection for all
+ The <literal role="sysvar">myisam_stats_method</literal> system
+ variable has global and session values. Setting the global value
+ affects <literal>MyISAM</literal> statistics collection for all
<literal>MyISAM</literal> tables. Setting the session value
affects statistics collection only for the current client
connection. This means that you can force a table's statistics
@@ -7366,8 +7370,9 @@
<listitem>
<para>
- Set <literal role="sysvar">myisam_stats_method</literal>, and then issue a
- <literal role="stmt">CHECK TABLE</literal> statement
+ Set <literal role="sysvar">myisam_stats_method</literal>,
+ and then issue a <literal role="stmt">CHECK TABLE</literal>
+ statement
</para>
</listitem>
@@ -7383,8 +7388,9 @@
<para>
Change the table to cause its statistics to go out of date
(for example, insert a row and then delete it), and then set
- <literal role="sysvar">myisam_stats_method</literal> and issue an
- <literal role="stmt">ANALYZE TABLE</literal> statement
+ <literal role="sysvar">myisam_stats_method</literal> and
+ issue an <literal role="stmt">ANALYZE TABLE</literal>
+ statement
</para>
</listitem>
@@ -7407,11 +7413,13 @@
(This may occur for bulk inserts or deletes, or some
<literal role="stmt">ALTER TABLE</literal> statements, for
example.) If this happens, the statistics are collected
- using whatever value <literal role="sysvar">myisam_stats_method</literal>
- has at the time. Thus, if you collect statistics using one
- method, but <literal role="sysvar">myisam_stats_method</literal> is set to
- the other method when a table's statistics are collected
- automatically later, the other method will be used.
+ using whatever value
+ <literal role="sysvar">myisam_stats_method</literal> has at
+ the time. Thus, if you collect statistics using one method,
+ but <literal role="sysvar">myisam_stats_method</literal> is
+ set to the other method when a table's statistics are
+ collected automatically later, the other method will be
+ used.
</para>
</listitem>
@@ -7424,10 +7432,11 @@
<listitem>
<para>
- <literal role="sysvar">myisam_stats_method</literal> applies only to
- <literal>MyISAM</literal> tables. Other storage engines have
- only one method for collecting table statistics. Usually it
- is closer to the <literal>nulls_equal</literal> method.
+ <literal role="sysvar">myisam_stats_method</literal> applies
+ only to <literal>MyISAM</literal> tables. Other storage
+ engines have only one method for collecting table
+ statistics. Usually it is closer to the
+ <literal>nulls_equal</literal> method.
</para>
</listitem>
@@ -7506,11 +7515,11 @@
<para>
The <literal>table_cache</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_tmp_tables</literal> system variables affect the
- maximum number of files the server keeps open. If you increase
- one or more of these values, you may run up against a limit
- imposed by your operating system on the per-process number of
- open file descriptors. Many operating systems allow you to
+ <literal role="sysvar">max_tmp_tables</literal> system variables
+ affect the maximum number of files the server keeps open. If you
+ increase one or more of these values, you may run up against a
+ limit imposed by your operating system on the per-process number
+ of open file descriptors. Many operating systems allow you to
increase the open-files limit, although the method varies widely
from system to system. Consult your operating system
documentation to determine whether it is possible to increase
Modified: trunk/refman-4.1/programs-admin-util.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/programs-admin-util.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 1187 bytes
@@ -799,15 +799,16 @@
</para>
<para>
- <literal role="sysvar">myisam_block_size</literal> is the size used for index
- blocks. It is available as of MySQL 4.0.0.
+ <literal role="sysvar">myisam_block_size</literal> is the size
+ used for index blocks. It is available as of MySQL 4.0.0.
</para>
<para>
<literal>stats_method</literal> influences how
<literal>NULL</literal> values are treated for index statistics
collection when the <option>--analyze</option> option is given.
- It acts like the <literal role="sysvar">myisam_stats_method</literal> system
+ It acts like the
+ <literal role="sysvar">myisam_stats_method</literal> system
variable. For more information, see the description of
<literal role="sysvar">myisam_stats_method</literal> in
<xref linkend="server-system-variables"/>, and
Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/replication-options-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 7; 1653 bytes
@@ -988,9 +988,10 @@
numeric suffix to the basename. You can specify the option to
create hostname-independent relay log names, or if your relay
logs tend to be big (and you don't want to decrease
- <literal role="sysvar">max_relay_log_size</literal>) and you need to put
- them in some area different from the data directory, or if you
- want to increase speed by balancing load between disks.
+ <literal role="sysvar">max_relay_log_size</literal>) and you
+ need to put them in some area different from the data
+ directory, or if you want to increase speed by balancing load
+ between disks.
</para>
</listitem>
@@ -1929,10 +1930,11 @@
</para>
<para>
- If <literal role="sysvar">max_relay_log_size</literal> is 0, the value of
- <literal role="sysvar">max_binlog_size</literal> applies to
- relay logs as well. <literal role="sysvar">max_relay_log_size</literal> was
- added in MySQL 4.0.14.
+ If <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the value of <literal role="sysvar">max_binlog_size</literal>
+ applies to relay logs as well.
+ <literal role="sysvar">max_relay_log_size</literal> was added
+ in MySQL 4.0.14.
</para>
</listitem>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/replication.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 3; 1390 bytes
@@ -493,20 +493,23 @@
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
greater than 0, that is the maximum relay log file size.
</para>
</listitem>
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
0, <literal role="sysvar">max_binlog_size</literal>
determines the maximum relay log file size.
<literal role="sysvar">max_binlog_size</literal> always
determines the relay log size before MySQL 4.0.14, the
first version in which
- <literal role="sysvar">max_relay_log_size</literal> appears.
+ <literal role="sysvar">max_relay_log_size</literal>
+ appears.
</para>
</listitem>
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/se-innodb-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 970 bytes
@@ -7733,9 +7733,9 @@
values good enough for your particular tables, you can use
<literal>FORCE INDEX</literal> with your queries to force the
use of a particular index, or set the
- <literal role="sysvar">max_seeks_for_key</literal> system variable to ensure
- that MySQL prefers index lookups over table scans. See
- <xref linkend="server-system-variables"/>, and
+ <literal role="sysvar">max_seeks_for_key</literal> system
+ variable to ensure that MySQL prefers index lookups over table
+ scans. See <xref linkend="server-system-variables"/>, and
<xref linkend="optimizer-issues"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-definition.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/sql-syntax-data-definition.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 6; 2031 bytes
@@ -250,8 +250,9 @@
to be copied (such as when you change the name of a column). For
<literal>MyISAM</literal> tables, you can speed up the index
re-creation operation (which is the slowest part of the alteration
- process) by setting the <literal role="sysvar">myisam_sort_buffer_size</literal>
- system variable to a high value.
+ process) by setting the
+ <literal role="sysvar">myisam_sort_buffer_size</literal> system
+ variable to a high value.
</para>
<para>
@@ -2268,8 +2269,8 @@
<literal role="type">BLOB</literal> column in a
<literal role="stmt">SELECT</literal>, the server sorts values
using only the initial number of bytes indicated by the
- <literal role="sysvar">max_sort_length</literal> system variable. See
- <xref linkend="blob"/>.
+ <literal role="sysvar">max_sort_length</literal> system
+ variable. See <xref linkend="blob"/>.
</para>
</listitem>
@@ -2561,8 +2562,9 @@
system limit.) If you want to keep down the pointer sizes to
make the index smaller and faster and you do not really need
big files, you can decrease the default pointer size by
- setting the <literal role="sysvar">myisam_data_pointer_size</literal> system
- variable, which was added in MySQL 4.1.2. (See
+ setting the
+ <literal role="sysvar">myisam_data_pointer_size</literal>
+ system variable, which was added in MySQL 4.1.2. (See
<xref linkend="server-system-variables"/>.) If you want all
your tables to be able to grow above the default limit and are
willing to have your tables slightly slower and larger than
Modified: trunk/refman-4.1/sql-syntax-prepared-statements.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-prepared-statements.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/sql-syntax-prepared-statements.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 653 bytes
@@ -270,8 +270,9 @@
<para>
To guard against too many prepared statements being created
- simultaneously, the <literal role="sysvar">max_prepared_stmt_count</literal>
- system variable can be set.
+ simultaneously, the
+ <literal role="sysvar">max_prepared_stmt_count</literal> system
+ variable can be set.
</para>
<para>
Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 717 bytes
@@ -3018,7 +3018,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following two
statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/data-types.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 8; 2315 bytes
@@ -4930,10 +4930,11 @@
<listitem>
<para>
- Only the first <literal role="sysvar">max_sort_length</literal> bytes of
+ Only the first
+ <literal role="sysvar">max_sort_length</literal> bytes of
the column are used when sorting. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024. This value can
- be changed using the
+ <literal role="sysvar">max_sort_length</literal> is 1024.
+ This value can be changed using the
<option>--max_sort_length=<replaceable>N</replaceable></option>
option when starting the <command>mysqld</command> server.
See <xref linkend="server-system-variables"/>.
@@ -4942,8 +4943,8 @@
<para>
You can make more bytes significant in sorting or grouping
by increasing the value of
- <literal role="sysvar">max_sort_length</literal> at runtime. Any client
- can change the value of its session
+ <literal role="sysvar">max_sort_length</literal> at runtime.
+ Any client can change the value of its session
<literal role="sysvar">max_sort_length</literal> variable:
</para>
@@ -4959,9 +4960,9 @@
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> column containing long
values when you want more than
- <literal role="sysvar">max_sort_length</literal> bytes to be significant
- is to convert the column value into a fixed-length object.
- The standard way to do this is with the
+ <literal role="sysvar">max_sort_length</literal> bytes to be
+ significant is to convert the column value into a
+ fixed-length object. The standard way to do this is with the
<literal role="func">SUBSTRING()</literal> function. For
example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/dba-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 15, Lines Added: 62, Lines Deleted: 52; 11128 bytes
@@ -6153,15 +6153,16 @@
<para>
Do not allow <literal role="stmt">SELECT</literal>
statements that probably need to examine more than
- <literal role="sysvar">max_join_size</literal> rows (for single-table
- statements) or row combinations (for multiple-table
- statements) or that are likely to do more than
- <literal role="sysvar">max_join_size</literal> disk seeks. By setting this
- value, you can catch <literal role="stmt">SELECT</literal>
- statements where keys are not used properly and that would
- probably take a long time. Set it if your users tend to
- perform joins that lack a <literal>WHERE</literal> clause,
- that take a long time, or that return millions of rows.
+ <literal role="sysvar">max_join_size</literal> rows (for
+ single-table statements) or row combinations (for
+ multiple-table statements) or that are likely to do more
+ than <literal role="sysvar">max_join_size</literal> disk
+ seeks. By setting this value, you can catch
+ <literal role="stmt">SELECT</literal> statements where keys
+ are not used properly and that would probably take a long
+ time. Set it if your users tend to perform joins that lack a
+ <literal>WHERE</literal> clause, that take a long time, or
+ that return millions of rows.
</para>
<para>
@@ -6170,8 +6171,8 @@
<literal role="sysvar">sql_big_selects</literal> to
<literal>0</literal>. If you set the
<literal role="sysvar">sql_big_selects</literal> value
- again, the <literal role="sysvar">max_join_size</literal> variable is
- ignored.
+ again, the <literal role="sysvar">max_join_size</literal>
+ variable is ignored.
</para>
<para>
@@ -6261,14 +6262,17 @@
the current log file size to exceed the value of this
variable, the slave rotates the relay logs (closes the
current file and opens the next one). If
- <literal role="sysvar">max_relay_log_size</literal> is 0, the server uses
+ <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the server uses
<literal role="sysvar">max_binlog_size</literal> for both
the binary log and the relay log. If
- <literal role="sysvar">max_relay_log_size</literal> is greater than 0, it
- constrains the size of the relay log, which enables you to
- have different sizes for the two logs. You must set
- <literal role="sysvar">max_relay_log_size</literal> to between 4096 bytes
- and 1GB (inclusive), or to 0. The default value is 0. See
+ <literal role="sysvar">max_relay_log_size</literal> is
+ greater than 0, it constrains the size of the relay log,
+ which enables you to have different sizes for the two logs.
+ You must set
+ <literal role="sysvar">max_relay_log_size</literal> to
+ between 4096 bytes and 1GB (inclusive), or to 0. The default
+ value is 0. See
<xref linkend="replication-implementation-details"/>.
</para>
</listitem>
@@ -6321,8 +6325,8 @@
The number of bytes to use when sorting
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> values. Only the first
- <literal role="sysvar">max_sort_length</literal> bytes of each value are
- used; the rest are ignored.
+ <literal role="sysvar">max_sort_length</literal> bytes of
+ each value are used; the rest are ignored.
</para>
</listitem>
@@ -6352,9 +6356,10 @@
<para>
Stored procedure recursion increases the demand on thread
stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
- necessary to increase thread stack size by increasing the
- value of <literal>thread_stack</literal> at server startup.
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it
+ may be necessary to increase thread stack size by increasing
+ the value of <literal>thread_stack</literal> at server
+ startup.
</para>
<para>
@@ -6621,7 +6626,8 @@
<para>
The maximum allowable setting for
- <literal role="sysvar">myisam_sort_buffer_size</literal> is 4GB.
+ <literal role="sysvar">myisam_sort_buffer_size</literal> is
+ 4GB.
</para>
</listitem>
@@ -7078,9 +7084,9 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 5.0.21. In MySQL 5.0.32, it
- was converted to the global
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 5.0.21.
+ In MySQL 5.0.32, it was converted to the global
<literal>Prepared_stmt_count</literal> status variable.
</para>
</listitem>
@@ -9135,14 +9141,16 @@
likely to take a very long time to execute (that is,
statements for which the optimizer estimates that the number
of examined rows exceeds the value of
- <literal role="sysvar">max_join_size</literal>). This is useful when an
- inadvisable <literal>WHERE</literal> statement has been
- issued. The default value for a new connection is 1, which
- allows all <literal role="stmt">SELECT</literal> statements.
+ <literal role="sysvar">max_join_size</literal>). This is
+ useful when an inadvisable <literal>WHERE</literal>
+ statement has been issued. The default value for a new
+ connection is 1, which allows all
+ <literal role="stmt">SELECT</literal> statements.
</para>
<para>
- If you set the <literal role="sysvar">max_join_size</literal> system
+ If you set the
+ <literal role="sysvar">max_join_size</literal> system
variable to a value other than <literal>DEFAULT</literal>,
<literal role="sysvar">sql_big_selects</literal> is set to
0.
@@ -9666,7 +9674,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following
two statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
@@ -11396,8 +11405,8 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 5.0.32.
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 5.0.32.
</para>
</listitem>
@@ -15201,8 +15210,8 @@
<para>
If you want to restrict the number of connections allowed to
a single account, you can do so by setting the
- <literal role="sysvar">max_user_connections</literal> variable in
- <command>mysqld</command>. The
+ <literal role="sysvar">max_user_connections</literal>
+ variable in <command>mysqld</command>. The
<literal role="stmt">GRANT</literal> statement also supports
resource control options for limiting the extent of server
use allowed to an account. See <xref linkend="grant"/>.
@@ -16211,8 +16220,8 @@
<para>
The <literal>Create_routine_priv</literal>,
<literal>Alter_routine_priv</literal>, and
- <literal role="sysvar">max_user_connections</literal> columns were added in
- MySQL 5.0.3.
+ <literal role="sysvar">max_user_connections</literal> columns
+ were added in MySQL 5.0.3.
</para>
<para>
@@ -20390,14 +20399,14 @@
<para>
One means of limiting use of MySQL server resources is to set
- the <literal role="sysvar">max_user_connections</literal> system variable to a
- non-zero value. However, this method is strictly global, and
- does not allow for management of individual accounts. In
- addition, it limits only the number of simultaneous connections
- made using a single account, and not what a client can do once
- connected. Both types of control are of interest to many MySQL
- administrators, particularly those working for Internet Service
- Providers.
+ the <literal role="sysvar">max_user_connections</literal> system
+ variable to a non-zero value. However, this method is strictly
+ global, and does not allow for management of individual
+ accounts. In addition, it limits only the number of simultaneous
+ connections made using a single account, and not what a client
+ can do once connected. Both types of control are of interest to
+ many MySQL administrators, particularly those working for
+ Internet Service Providers.
</para>
<para>
@@ -20479,9 +20488,10 @@
limits are stored in the <literal>max_questions</literal>,
<literal>max_updates</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_user_connections</literal> columns. If your
- <literal>user</literal> table doesn't have these columns, it
- must be upgraded; see <xref linkend="mysql-upgrade"/>.
+ <literal role="sysvar">max_user_connections</literal> columns.
+ If your <literal>user</literal> table doesn't have these
+ columns, it must be upgraded; see
+ <xref linkend="mysql-upgrade"/>.
</para>
<para>
@@ -20515,9 +20525,9 @@
indicating the maximum number of simultaneous connections the
account can make at any one time. If the limit is set to the
default value of zero, the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/errors-problems.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 10; 2325 bytes
@@ -1849,11 +1849,12 @@
<para>
To change the default size limit for
<literal>MyISAM</literal> tables, set the
- <literal role="sysvar">myisam_data_pointer_size</literal>, which sets
- the number of bytes used for internal row pointers. The
- value is used to set the pointer size for new tables if
- you do not specify the <literal>MAX_ROWS</literal> option.
- The value of <literal role="sysvar">myisam_data_pointer_size</literal>
+ <literal role="sysvar">myisam_data_pointer_size</literal>,
+ which sets the number of bytes used for internal row
+ pointers. The value is used to set the pointer size for
+ new tables if you do not specify the
+ <literal>MAX_ROWS</literal> option. The value of
+ <literal role="sysvar">myisam_data_pointer_size</literal>
can be from 2 to 7. A value of 4 allows tables up to 4GB;
a value of 6 allows tables up to 256TB.
</para>
@@ -5564,11 +5565,12 @@
<literal role="type">TEXT</literal> values can't reliably
be used in <literal>GROUP BY</literal>, <literal>ORDER
BY</literal> or <literal>DISTINCT</literal>. Only the
- first <literal role="sysvar">max_sort_length</literal> bytes are used
- when comparing <literal role="type">BLOB</literal> values
- in these cases. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024 and can be
- changed at server startup time or at runtime.
+ first <literal role="sysvar">max_sort_length</literal>
+ bytes are used when comparing
+ <literal role="type">BLOB</literal> values in these cases.
+ The default value of
+ <literal role="sysvar">max_sort_length</literal> is 1024
+ and can be changed at server startup time or at runtime.
</para>
</listitem>
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/optimization.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 9, Lines Added: 42, Lines Deleted: 34; 7619 bytes
@@ -1655,8 +1655,8 @@
of the <literal role="stmt">EXPLAIN</literal> output. This
should tell you roughly how many rows MySQL must examine to
execute the query. If you restrict queries with the
- <literal role="sysvar">max_join_size</literal> system variable, this row
- product also is used to determine which multiple-table
+ <literal role="sysvar">max_join_size</literal> system variable,
+ this row product also is used to determine which multiple-table
<literal role="stmt">SELECT</literal> statements to execute and
which to abort. See <xref linkend="server-parameters"/>.
</para>
@@ -5004,16 +5004,18 @@
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
tuple does not exceed the value of the
- <literal role="sysvar">max_length_for_sort_data</literal> system variable. (A
- symptom of setting the value of this variable too high is that
- you should see high disk activity and low CPU activity.)
+ <literal role="sysvar">max_length_for_sort_data</literal> system
+ variable. (A symptom of setting the value of this variable too
+ high is that you should see high disk activity and low CPU
+ activity.)
</para>
<para>
For slow queries for which <literal>filesort</literal> is not
used, you might try lowering
- <literal role="sysvar">max_length_for_sort_data</literal> to a value that is
- appropriate to trigger a <literal>filesort</literal>.
+ <literal role="sysvar">max_length_for_sort_data</literal> to a
+ value that is appropriate to trigger a
+ <literal>filesort</literal>.
</para>
<para>
@@ -7609,12 +7611,13 @@
<listitem>
<para>
You can start <command>mysqld</command> with a low value for
- the <literal role="sysvar">max_write_lock_count</literal> system variable
- to force MySQL to temporarily elevate the priority of all
- <literal role="stmt">SELECT</literal> statements that are
- waiting for a table after a specific number of inserts to
- the table occur. This allows <literal>READ</literal> locks
- after a certain number of <literal>WRITE</literal> locks.
+ the <literal role="sysvar">max_write_lock_count</literal>
+ system variable to force MySQL to temporarily elevate the
+ priority of all <literal role="stmt">SELECT</literal>
+ statements that are waiting for a table after a specific
+ number of inserts to the table occur. This allows
+ <literal>READ</literal> locks after a certain number of
+ <literal>WRITE</literal> locks.
</para>
</listitem>
@@ -9556,8 +9559,9 @@
<para>
For <literal>MyISAM</literal> tables, you have some control over
collection of table statistics by means of the
- <literal role="sysvar">myisam_stats_method</literal> system variable. This
- variable has two possible values, which differ as follows:
+ <literal role="sysvar">myisam_stats_method</literal> system
+ variable. This variable has two possible values, which differ as
+ follows:
</para>
<itemizedlist>
@@ -9618,9 +9622,9 @@
</para>
<para>
- The <literal role="sysvar">myisam_stats_method</literal> system variable has
- global and session values. Setting the global value affects
- <literal>MyISAM</literal> statistics collection for all
+ The <literal role="sysvar">myisam_stats_method</literal> system
+ variable has global and session values. Setting the global value
+ affects <literal>MyISAM</literal> statistics collection for all
<literal>MyISAM</literal> tables. Setting the session value
affects statistics collection only for the current client
connection. This means that you can force a table's statistics
@@ -9648,8 +9652,9 @@
<para>
Change the table to cause its statistics to go out of date
(for example, insert a row and then delete it), and then set
- <literal role="sysvar">myisam_stats_method</literal> and issue an
- <literal role="stmt">ANALYZE TABLE</literal> statement
+ <literal role="sysvar">myisam_stats_method</literal> and
+ issue an <literal role="stmt">ANALYZE TABLE</literal>
+ statement
</para>
</listitem>
@@ -9672,11 +9677,13 @@
(This may occur for bulk inserts or deletes, or some
<literal role="stmt">ALTER TABLE</literal> statements, for
example.) If this happens, the statistics are collected
- using whatever value <literal role="sysvar">myisam_stats_method</literal>
- has at the time. Thus, if you collect statistics using one
- method, but <literal role="sysvar">myisam_stats_method</literal> is set to
- the other method when a table's statistics are collected
- automatically later, the other method will be used.
+ using whatever value
+ <literal role="sysvar">myisam_stats_method</literal> has at
+ the time. Thus, if you collect statistics using one method,
+ but <literal role="sysvar">myisam_stats_method</literal> is
+ set to the other method when a table's statistics are
+ collected automatically later, the other method will be
+ used.
</para>
</listitem>
@@ -9689,10 +9696,11 @@
<listitem>
<para>
- <literal role="sysvar">myisam_stats_method</literal> applies only to
- <literal>MyISAM</literal> tables. Other storage engines have
- only one method for collecting table statistics. Usually it
- is closer to the <literal>nulls_equal</literal> method.
+ <literal role="sysvar">myisam_stats_method</literal> applies
+ only to <literal>MyISAM</literal> tables. Other storage
+ engines have only one method for collecting table
+ statistics. Usually it is closer to the
+ <literal>nulls_equal</literal> method.
</para>
</listitem>
@@ -9771,11 +9779,11 @@
<para>
The <literal>table_cache</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_tmp_tables</literal> system variables affect the
- maximum number of files the server keeps open. If you increase
- one or more of these values, you may run up against a limit
- imposed by your operating system on the per-process number of
- open file descriptors. Many operating systems allow you to
+ <literal role="sysvar">max_tmp_tables</literal> system variables
+ affect the maximum number of files the server keeps open. If you
+ increase one or more of these values, you may run up against a
+ limit imposed by your operating system on the per-process number
+ of open file descriptors. Many operating systems allow you to
increase the open-files limit, although the method varies widely
from system to system. Consult your operating system
documentation to determine whether it is possible to increase
Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/programs-admin-util-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 1132 bytes
@@ -906,15 +906,16 @@
</para>
<para>
- <literal role="sysvar">myisam_block_size</literal> is the size used for index
- blocks.
+ <literal role="sysvar">myisam_block_size</literal> is the size
+ used for index blocks.
</para>
<para>
<literal>stats_method</literal> influences how
<literal>NULL</literal> values are treated for index statistics
collection when the <option>--analyze</option> option is given.
- It acts like the <literal role="sysvar">myisam_stats_method</literal> system
+ It acts like the
+ <literal role="sysvar">myisam_stats_method</literal> system
variable. For more information, see the description of
<literal role="sysvar">myisam_stats_method</literal> in
<xref linkend="server-system-variables"/>, and
Modified: trunk/refman-5.0/replication-implementation.xml
===================================================================
--- trunk/refman-5.0/replication-implementation.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/replication-implementation.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 3; 1114 bytes
@@ -342,15 +342,17 @@
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
greater than 0, that is the maximum relay log file size.
</para>
</listitem>
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
- 0, <literal role="sysvar">max_binlog_size</literal>
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is 0,
+ <literal role="sysvar">max_binlog_size</literal>
determines the maximum relay log file size.
</para>
</listitem>
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/replication-options-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1465 bytes
@@ -1292,9 +1292,10 @@
numeric suffix to the basename. You can specify the option to
create hostname-independent relay log names, or if your relay
logs tend to be big (and you don't want to decrease
- <literal role="sysvar">max_relay_log_size</literal>) and you need to put
- them in some area different from the data directory, or if you
- want to increase speed by balancing load between disks.
+ <literal role="sysvar">max_relay_log_size</literal>) and you
+ need to put them in some area different from the data
+ directory, or if you want to increase speed by balancing load
+ between disks.
</para>
</listitem>
@@ -2231,9 +2232,9 @@
</para>
<para>
- If <literal role="sysvar">max_relay_log_size</literal> is 0, the value of
- <literal role="sysvar">max_binlog_size</literal> applies to
- relay logs as well.
+ If <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the value of <literal role="sysvar">max_binlog_size</literal>
+ applies to relay logs as well.
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/se-innodb-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 970 bytes
@@ -7919,9 +7919,9 @@
values good enough for your particular tables, you can use
<literal>FORCE INDEX</literal> with your queries to force the
use of a particular index, or set the
- <literal role="sysvar">max_seeks_for_key</literal> system variable to ensure
- that MySQL prefers index lookups over table scans. See
- <xref linkend="server-system-variables"/>, and
+ <literal role="sysvar">max_seeks_for_key</literal> system
+ variable to ensure that MySQL prefers index lookups over table
+ scans. See <xref linkend="server-system-variables"/>, and
<xref linkend="optimizer-issues"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 6; 1990 bytes
@@ -362,8 +362,9 @@
to be copied (such as when you change the name of a column). For
<literal>MyISAM</literal> tables, you can speed up the index
re-creation operation (which is the slowest part of the alteration
- process) by setting the <literal role="sysvar">myisam_sort_buffer_size</literal>
- system variable to a high value.
+ process) by setting the
+ <literal role="sysvar">myisam_sort_buffer_size</literal> system
+ variable to a high value.
</para>
<para>
@@ -3171,8 +3172,8 @@
<literal role="type">BLOB</literal> column in a
<literal role="stmt">SELECT</literal>, the server sorts values
using only the initial number of bytes indicated by the
- <literal role="sysvar">max_sort_length</literal> system variable. See
- <xref linkend="blob"/>.
+ <literal role="sysvar">max_sort_length</literal> system
+ variable. See <xref linkend="blob"/>.
</para>
</listitem>
@@ -3465,8 +3466,8 @@
you want to keep down the pointer sizes to make the index
smaller and faster and you don't really need big files, you
can decrease the default pointer size by setting the
- <literal role="sysvar">myisam_data_pointer_size</literal> system variable,
- which was added in MySQL 4.1.2. (See
+ <literal role="sysvar">myisam_data_pointer_size</literal>
+ system variable, which was added in MySQL 4.1.2. (See
<xref linkend="server-system-variables"/>.) If you want all
your tables to be able to grow above the default limit and are
willing to have your tables slightly slower and larger than
Modified: trunk/refman-5.0/sql-syntax-prepared-statements.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-prepared-statements.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/sql-syntax-prepared-statements.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 653 bytes
@@ -277,8 +277,9 @@
<para>
To guard against too many prepared statements being created
- simultaneously, the <literal role="sysvar">max_prepared_stmt_count</literal>
- system variable can be set.
+ simultaneously, the
+ <literal role="sysvar">max_prepared_stmt_count</literal> system
+ variable can be set.
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 1204 bytes
@@ -1177,7 +1177,8 @@
in MySQL 5.0.3, limits the maximum number of simultaneous
connections that the account can make. If
<replaceable>count</replaceable> is <literal>0</literal> (the
- default), the <literal role="sysvar">max_user_connections</literal> system
+ default), the
+ <literal role="sysvar">max_user_connections</literal> system
variable determines the number of simultaneous connections for
the account.
</para>
@@ -3401,7 +3402,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following two
statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
Modified: trunk/refman-5.0/stored-routines.xml
===================================================================
--- trunk/refman-5.0/stored-routines.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.0/stored-routines.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1301 bytes
@@ -231,11 +231,12 @@
<para>
Recursion in stored procedures is allowed but disabled by default.
To enable recursion, set the
- <literal role="sysvar">max_sp_recursion_depth</literal> server system variable
- to a value greater than zero. Stored procedure recursion increases
- the demand on thread stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be necessary to
- increase thread stack size by increasing the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal> server
+ system variable to a value greater than zero. Stored procedure
+ recursion increases the demand on thread stack space. If you
+ increase the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
+ necessary to increase thread stack size by increasing the value of
<literal>thread_stack</literal> at server startup. See
<xref linkend="server-system-variables"/>, for more information.
</para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/data-types.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 8; 2315 bytes
@@ -4657,10 +4657,11 @@
<listitem>
<para>
- Only the first <literal role="sysvar">max_sort_length</literal> bytes of
+ Only the first
+ <literal role="sysvar">max_sort_length</literal> bytes of
the column are used when sorting. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024. This value can
- be changed using the
+ <literal role="sysvar">max_sort_length</literal> is 1024.
+ This value can be changed using the
<option>--max_sort_length=<replaceable>N</replaceable></option>
option when starting the <command>mysqld</command> server.
See <xref linkend="server-system-variables"/>.
@@ -4669,8 +4670,8 @@
<para>
You can make more bytes significant in sorting or grouping
by increasing the value of
- <literal role="sysvar">max_sort_length</literal> at runtime. Any client
- can change the value of its session
+ <literal role="sysvar">max_sort_length</literal> at runtime.
+ Any client can change the value of its session
<literal role="sysvar">max_sort_length</literal> variable:
</para>
@@ -4686,9 +4687,9 @@
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> column containing long
values when you want more than
- <literal role="sysvar">max_sort_length</literal> bytes to be significant
- is to convert the column value into a fixed-length object.
- The standard way to do this is with the
+ <literal role="sysvar">max_sort_length</literal> bytes to be
+ significant is to convert the column value into a
+ fixed-length object. The standard way to do this is with the
<literal role="func">SUBSTRING()</literal> function. For
example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/dba-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 15, Lines Added: 75, Lines Deleted: 66; 13150 bytes
@@ -6443,15 +6443,16 @@
<para>
Do not allow <literal role="stmt">SELECT</literal>
statements that probably need to examine more than
- <literal role="sysvar">max_join_size</literal> rows (for single-table
- statements) or row combinations (for multiple-table
- statements) or that are likely to do more than
- <literal role="sysvar">max_join_size</literal> disk seeks. By setting this
- value, you can catch <literal role="stmt">SELECT</literal>
- statements where keys are not used properly and that would
- probably take a long time. Set it if your users tend to
- perform joins that lack a <literal>WHERE</literal> clause,
- that take a long time, or that return millions of rows.
+ <literal role="sysvar">max_join_size</literal> rows (for
+ single-table statements) or row combinations (for
+ multiple-table statements) or that are likely to do more
+ than <literal role="sysvar">max_join_size</literal> disk
+ seeks. By setting this value, you can catch
+ <literal role="stmt">SELECT</literal> statements where keys
+ are not used properly and that would probably take a long
+ time. Set it if your users tend to perform joins that lack a
+ <literal>WHERE</literal> clause, that take a long time, or
+ that return millions of rows.
</para>
<para>
@@ -6460,8 +6461,8 @@
<literal role="sysvar">sql_big_selects</literal> to
<literal>0</literal>. If you set the
<literal role="sysvar">sql_big_selects</literal> value
- again, the <literal role="sysvar">max_join_size</literal> variable is
- ignored.
+ again, the <literal role="sysvar">max_join_size</literal>
+ variable is ignored.
</para>
<para>
@@ -6551,14 +6552,17 @@
the current log file size to exceed the value of this
variable, the slave rotates the relay logs (closes the
current file and opens the next one). If
- <literal role="sysvar">max_relay_log_size</literal> is 0, the server uses
+ <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the server uses
<literal role="sysvar">max_binlog_size</literal> for both
the binary log and the relay log. If
- <literal role="sysvar">max_relay_log_size</literal> is greater than 0, it
- constrains the size of the relay log, which enables you to
- have different sizes for the two logs. You must set
- <literal role="sysvar">max_relay_log_size</literal> to between 4096 bytes
- and 1GB (inclusive), or to 0. The default value is 0. See
+ <literal role="sysvar">max_relay_log_size</literal> is
+ greater than 0, it constrains the size of the relay log,
+ which enables you to have different sizes for the two logs.
+ You must set
+ <literal role="sysvar">max_relay_log_size</literal> to
+ between 4096 bytes and 1GB (inclusive), or to 0. The default
+ value is 0. See
<xref linkend="replication-implementation-details"/>.
</para>
</listitem>
@@ -6611,8 +6615,8 @@
The number of bytes to use when sorting
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> values. Only the first
- <literal role="sysvar">max_sort_length</literal> bytes of each value are
- used; the rest are ignored.
+ <literal role="sysvar">max_sort_length</literal> bytes of
+ each value are used; the rest are ignored.
</para>
</listitem>
@@ -6642,9 +6646,10 @@
<para>
Stored procedure recursion increases the demand on thread
stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
- necessary to increase thread stack size by increasing the
- value of <literal>thread_stack</literal> at server startup.
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it
+ may be necessary to increase thread stack size by increasing
+ the value of <literal>thread_stack</literal> at server
+ startup.
</para>
</listitem>
@@ -6909,10 +6914,10 @@
<para>
The maximum allowable setting for
- <literal role="sysvar">myisam_sort_buffer_size</literal> is 4GB. As of
- MySQL 5.1.23, values larger than 4GB are allowed for 64-bit
- platforms (except 64-bit Windows, for which large values are
- truncated to 4GB with a warning).
+ <literal role="sysvar">myisam_sort_buffer_size</literal> is
+ 4GB. As of MySQL 5.1.23, values larger than 4GB are allowed
+ for 64-bit platforms (except 64-bit Windows, for which large
+ values are truncated to 4GB with a warning).
</para>
</listitem>
@@ -7422,9 +7427,9 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 5.1.10. In MySQL 5.1.14, it
- was converted to the global
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 5.1.10.
+ In MySQL 5.1.14, it was converted to the global
<literal>Prepared_stmt_count</literal> status variable.
</para>
</listitem>
@@ -9762,14 +9767,16 @@
likely to take a very long time to execute (that is,
statements for which the optimizer estimates that the number
of examined rows exceeds the value of
- <literal role="sysvar">max_join_size</literal>). This is useful when an
- inadvisable <literal>WHERE</literal> statement has been
- issued. The default value for a new connection is 1, which
- allows all <literal role="stmt">SELECT</literal> statements.
+ <literal role="sysvar">max_join_size</literal>). This is
+ useful when an inadvisable <literal>WHERE</literal>
+ statement has been issued. The default value for a new
+ connection is 1, which allows all
+ <literal role="stmt">SELECT</literal> statements.
</para>
<para>
- If you set the <literal role="sysvar">max_join_size</literal> system
+ If you set the
+ <literal role="sysvar">max_join_size</literal> system
variable to a value other than <literal>DEFAULT</literal>,
<literal role="sysvar">sql_big_selects</literal> is set to
0.
@@ -10291,7 +10298,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following
two statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
@@ -12000,8 +12008,8 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
- This variable was added in MySQL 5.1.14.
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.) This variable was added in MySQL 5.1.14.
</para>
</listitem>
@@ -16411,19 +16419,19 @@
The slow query log consists of all SQL statements that took more
than <literal role="sysvar">long_query_time</literal> seconds to
execute and (as of MySQL 5.1.21) required at least
- <literal role="sysvar">min_examined_row_limit</literal> rows to be examined.
- The time to acquire the initial table locks is not counted as
- execution time. <command>mysqld</command> writes a statement to
- the slow query log after it has been executed and after all
- locks have been released, so log order might be different from
- execution order. The minimum and default values of
- <literal role="sysvar">long_query_time</literal> are 1 and 10,
- respectively. Prior to MySQL 5.1.21, the minimum value is 1, and
- the value for this variable must be an integer. Beginning with
- MySQL 5.1.21, the minimum is 0, and a resolution of microseconds
- is supported when logging to a file. However, the microseconds
- part is ignored and only integer values are written when logging
- to tables.
+ <literal role="sysvar">min_examined_row_limit</literal> rows to
+ be examined. The time to acquire the initial table locks is not
+ counted as execution time. <command>mysqld</command> writes a
+ statement to the slow query log after it has been executed and
+ after all locks have been released, so log order might be
+ different from execution order. The minimum and default values
+ of <literal role="sysvar">long_query_time</literal> are 1 and
+ 10, respectively. Prior to MySQL 5.1.21, the minimum value is 1,
+ and the value for this variable must be an integer. Beginning
+ with MySQL 5.1.21, the minimum is 0, and a resolution of
+ microseconds is supported when logging to a file. However, the
+ microseconds part is ignored and only integer values are written
+ when logging to tables.
</para>
<para>
@@ -17335,8 +17343,8 @@
<para>
If you want to restrict the number of connections allowed to
a single account, you can do so by setting the
- <literal role="sysvar">max_user_connections</literal> variable in
- <command>mysqld</command>. The
+ <literal role="sysvar">max_user_connections</literal>
+ variable in <command>mysqld</command>. The
<literal role="stmt">GRANT</literal> statement also supports
resource control options for limiting the extent of server
use allowed to an account. See <xref linkend="grant"/>.
@@ -22561,14 +22569,14 @@
<para>
One means of limiting use of MySQL server resources is to set
- the <literal role="sysvar">max_user_connections</literal> system variable to a
- non-zero value. However, this method is strictly global, and
- does not allow for management of individual accounts. In
- addition, it limits only the number of simultaneous connections
- made using a single account, and not what a client can do once
- connected. Both types of control are of interest to many MySQL
- administrators, particularly those working for Internet Service
- Providers.
+ the <literal role="sysvar">max_user_connections</literal> system
+ variable to a non-zero value. However, this method is strictly
+ global, and does not allow for management of individual
+ accounts. In addition, it limits only the number of simultaneous
+ connections made using a single account, and not what a client
+ can do once connected. Both types of control are of interest to
+ many MySQL administrators, particularly those working for
+ Internet Service Providers.
</para>
<para>
@@ -22650,9 +22658,10 @@
limits are stored in the <literal>max_questions</literal>,
<literal>max_updates</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_user_connections</literal> columns. If your
- <literal>user</literal> table doesn't have these columns, it
- must be upgraded; see <xref linkend="mysql-upgrade"/>.
+ <literal role="sysvar">max_user_connections</literal> columns.
+ If your <literal>user</literal> table doesn't have these
+ columns, it must be upgraded; see
+ <xref linkend="mysql-upgrade"/>.
</para>
<para>
@@ -22686,9 +22695,9 @@
indicating the maximum number of simultaneous connections the
account can make at any one time. If the limit is set to the
default value of zero, the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/errors-problems-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 10; 2340 bytes
@@ -1853,11 +1853,12 @@
<para>
To change the default size limit for
<literal>MyISAM</literal> tables, set the
- <literal role="sysvar">myisam_data_pointer_size</literal>, which sets
- the number of bytes used for internal row pointers. The
- value is used to set the pointer size for new tables if
- you do not specify the <literal>MAX_ROWS</literal> option.
- The value of <literal role="sysvar">myisam_data_pointer_size</literal>
+ <literal role="sysvar">myisam_data_pointer_size</literal>,
+ which sets the number of bytes used for internal row
+ pointers. The value is used to set the pointer size for
+ new tables if you do not specify the
+ <literal>MAX_ROWS</literal> option. The value of
+ <literal role="sysvar">myisam_data_pointer_size</literal>
can be from 2 to 7. A value of 4 allows tables up to 4GB;
a value of 6 allows tables up to 256TB.
</para>
@@ -5445,11 +5446,12 @@
<literal role="type">TEXT</literal> values can't reliably
be used in <literal>GROUP BY</literal>, <literal>ORDER
BY</literal> or <literal>DISTINCT</literal>. Only the
- first <literal role="sysvar">max_sort_length</literal> bytes are used
- when comparing <literal role="type">BLOB</literal> values
- in these cases. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024 and can be
- changed at server startup time or at runtime.
+ first <literal role="sysvar">max_sort_length</literal>
+ bytes are used when comparing
+ <literal role="type">BLOB</literal> values in these cases.
+ The default value of
+ <literal role="sysvar">max_sort_length</literal> is 1024
+ and can be changed at server startup time or at runtime.
</para>
</listitem>
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/optimization.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 10, Lines Added: 44, Lines Deleted: 35; 8110 bytes
@@ -1812,8 +1812,8 @@
of the <literal role="stmt">EXPLAIN</literal> output. This
should tell you roughly how many rows MySQL must examine to
execute the query. If you restrict queries with the
- <literal role="sysvar">max_join_size</literal> system variable, this row
- product also is used to determine which multiple-table
+ <literal role="sysvar">max_join_size</literal> system variable,
+ this row product also is used to determine which multiple-table
<literal role="stmt">SELECT</literal> statements to execute and
which to abort. See <xref linkend="server-parameters"/>.
</para>
@@ -5140,16 +5140,18 @@
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
tuple does not exceed the value of the
- <literal role="sysvar">max_length_for_sort_data</literal> system variable. (A
- symptom of setting the value of this variable too high is that
- you should see high disk activity and low CPU activity.)
+ <literal role="sysvar">max_length_for_sort_data</literal> system
+ variable. (A symptom of setting the value of this variable too
+ high is that you should see high disk activity and low CPU
+ activity.)
</para>
<para>
For slow queries for which <literal>filesort</literal> is not
used, you might try lowering
- <literal role="sysvar">max_length_for_sort_data</literal> to a value that is
- appropriate to trigger a <literal>filesort</literal>.
+ <literal role="sysvar">max_length_for_sort_data</literal> to a
+ value that is appropriate to trigger a
+ <literal>filesort</literal>.
</para>
<para>
@@ -8449,12 +8451,13 @@
<listitem>
<para>
You can start <command>mysqld</command> with a low value for
- the <literal role="sysvar">max_write_lock_count</literal> system variable
- to force MySQL to temporarily elevate the priority of all
- <literal role="stmt">SELECT</literal> statements that are
- waiting for a table after a specific number of inserts to
- the table occur. This allows <literal>READ</literal> locks
- after a certain number of <literal>WRITE</literal> locks.
+ the <literal role="sysvar">max_write_lock_count</literal>
+ system variable to force MySQL to temporarily elevate the
+ priority of all <literal role="stmt">SELECT</literal>
+ statements that are waiting for a table after a specific
+ number of inserts to the table occur. This allows
+ <literal>READ</literal> locks after a certain number of
+ <literal>WRITE</literal> locks.
</para>
</listitem>
@@ -10394,8 +10397,9 @@
<para>
For <literal>MyISAM</literal> tables, you have some control over
collection of table statistics by means of the
- <literal role="sysvar">myisam_stats_method</literal> system variable. This
- variable has two possible values, which differ as follows:
+ <literal role="sysvar">myisam_stats_method</literal> system
+ variable. This variable has two possible values, which differ as
+ follows:
</para>
<itemizedlist>
@@ -10456,9 +10460,9 @@
</para>
<para>
- The <literal role="sysvar">myisam_stats_method</literal> system variable has
- global and session values. Setting the global value affects
- <literal>MyISAM</literal> statistics collection for all
+ The <literal role="sysvar">myisam_stats_method</literal> system
+ variable has global and session values. Setting the global value
+ affects <literal>MyISAM</literal> statistics collection for all
<literal>MyISAM</literal> tables. Setting the session value
affects statistics collection only for the current client
connection. This means that you can force a table's statistics
@@ -10486,8 +10490,9 @@
<para>
Change the table to cause its statistics to go out of date
(for example, insert a row and then delete it), and then set
- <literal role="sysvar">myisam_stats_method</literal> and issue an
- <literal role="stmt">ANALYZE TABLE</literal> statement
+ <literal role="sysvar">myisam_stats_method</literal> and
+ issue an <literal role="stmt">ANALYZE TABLE</literal>
+ statement
</para>
</listitem>
@@ -10510,11 +10515,13 @@
(This may occur for bulk inserts or deletes, or some
<literal role="stmt">ALTER TABLE</literal> statements, for
example.) If this happens, the statistics are collected
- using whatever value <literal role="sysvar">myisam_stats_method</literal>
- has at the time. Thus, if you collect statistics using one
- method, but <literal role="sysvar">myisam_stats_method</literal> is set to
- the other method when a table's statistics are collected
- automatically later, the other method will be used.
+ using whatever value
+ <literal role="sysvar">myisam_stats_method</literal> has at
+ the time. Thus, if you collect statistics using one method,
+ but <literal role="sysvar">myisam_stats_method</literal> is
+ set to the other method when a table's statistics are
+ collected automatically later, the other method will be
+ used.
</para>
</listitem>
@@ -10527,10 +10534,11 @@
<listitem>
<para>
- <literal role="sysvar">myisam_stats_method</literal> applies only to
- <literal>MyISAM</literal> tables. Other storage engines have
- only one method for collecting table statistics. Usually it
- is closer to the <literal>nulls_equal</literal> method.
+ <literal role="sysvar">myisam_stats_method</literal> applies
+ only to <literal>MyISAM</literal> tables. Other storage
+ engines have only one method for collecting table
+ statistics. Usually it is closer to the
+ <literal>nulls_equal</literal> method.
</para>
</listitem>
@@ -10616,11 +10624,11 @@
<para>
The <literal>table_open_cache</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_tmp_tables</literal> system variables affect the
- maximum number of files the server keeps open. If you increase
- one or more of these values, you may run up against a limit
- imposed by your operating system on the per-process number of
- open file descriptors. Many operating systems allow you to
+ <literal role="sysvar">max_tmp_tables</literal> system variables
+ affect the maximum number of files the server keeps open. If you
+ increase one or more of these values, you may run up against a
+ limit imposed by your operating system on the per-process number
+ of open file descriptors. Many operating systems allow you to
increase the open-files limit, although the method varies widely
from system to system. Consult your operating system
documentation to determine whether it is possible to increase
@@ -16311,7 +16319,8 @@
<para>
Before MySQL 5.1.4, only compressed
<literal>MyISAM</literal> tables are memory mapped. As of
- MySQL 5.1.4, the <literal role="sysvar">myisam_use_mmap</literal> system
+ MySQL 5.1.4, the
+ <literal role="sysvar">myisam_use_mmap</literal> system
variable can be set to 1 to enable memory-mapping for all
<literal>MyISAM</literal> tables.
</para>
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/partitioning.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1165 bytes
@@ -4524,10 +4524,11 @@
<literal>open_files_limit</literal> is set properly.
For partitioned tables using the
<literal>MyISAM</literal> storage engine, increasing
- <literal role="sysvar">myisam_max_sort_file_size</literal> may
- improve performance; partitioning and repartitioning
- operations involving <literal>InnoDB</literal>
- tables may be made more efficient by enabling
+ <literal role="sysvar">myisam_max_sort_file_size</literal>
+ may improve performance; partitioning and
+ repartitioning operations involving
+ <literal>InnoDB</literal> tables may be made more
+ efficient by enabling
<literal>innodb_file_per_table</literal>.
</para>
Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/programs-admin-util-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 1132 bytes
@@ -903,15 +903,16 @@
</para>
<para>
- <literal role="sysvar">myisam_block_size</literal> is the size used for index
- blocks.
+ <literal role="sysvar">myisam_block_size</literal> is the size
+ used for index blocks.
</para>
<para>
<literal>stats_method</literal> influences how
<literal>NULL</literal> values are treated for index statistics
collection when the <option>--analyze</option> option is given.
- It acts like the <literal role="sysvar">myisam_stats_method</literal> system
+ It acts like the
+ <literal role="sysvar">myisam_stats_method</literal> system
variable. For more information, see the description of
<literal role="sysvar">myisam_stats_method</literal> in
<xref linkend="server-system-variables"/>, and
Modified: trunk/refman-5.1/replication-implementation.xml
===================================================================
--- trunk/refman-5.1/replication-implementation.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/replication-implementation.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 1058 bytes
@@ -417,14 +417,16 @@
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
greater than 0, that is the maximum relay log file size.
</para>
</listitem>
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
0, <literal role="sysvar">max_binlog_size</literal>
determines the maximum relay log file size.
</para>
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/replication-options-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1465 bytes
@@ -1353,9 +1353,10 @@
numeric suffix to the basename. You can specify the option to
create hostname-independent relay log names, or if your relay
logs tend to be big (and you don't want to decrease
- <literal role="sysvar">max_relay_log_size</literal>) and you need to put
- them in some area different from the data directory, or if you
- want to increase speed by balancing load between disks.
+ <literal role="sysvar">max_relay_log_size</literal>) and you
+ need to put them in some area different from the data
+ directory, or if you want to increase speed by balancing load
+ between disks.
</para>
</listitem>
@@ -2615,9 +2616,9 @@
</para>
<para>
- If <literal role="sysvar">max_relay_log_size</literal> is 0, the value of
- <literal role="sysvar">max_binlog_size</literal> applies to
- relay logs as well.
+ If <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the value of <literal role="sysvar">max_binlog_size</literal>
+ applies to relay logs as well.
</para>
</listitem>
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/se-innodb-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 970 bytes
@@ -8664,9 +8664,9 @@
values good enough for your particular tables, you can use
<literal>FORCE INDEX</literal> with your queries to force the
use of a particular index, or set the
- <literal role="sysvar">max_seeks_for_key</literal> system variable to ensure
- that MySQL prefers index lookups over table scans. See
- <xref linkend="server-system-variables"/>, and
+ <literal role="sysvar">max_seeks_for_key</literal> system
+ variable to ensure that MySQL prefers index lookups over table
+ scans. See <xref linkend="server-system-variables"/>, and
<xref linkend="optimizer-issues"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 11; 2489 bytes
@@ -908,8 +908,8 @@
wouldn't strictly need to be copied. For <literal>MyISAM</literal>
tables, you can speed up the index re-creation operation (which is
the slowest part of the alteration process) by setting the
- <literal role="sysvar">myisam_sort_buffer_size</literal> system variable to a
- high value.
+ <literal role="sysvar">myisam_sort_buffer_size</literal> system
+ variable to a high value.
</para>
<para>
@@ -5568,8 +5568,8 @@
<literal role="type">BLOB</literal> column in a
<literal role="stmt">SELECT</literal>, the server sorts values
using only the initial number of bytes indicated by the
- <literal role="sysvar">max_sort_length</literal> system variable. See
- <xref linkend="blob"/>.
+ <literal role="sysvar">max_sort_length</literal> system
+ variable. See <xref linkend="blob"/>.
</para>
</listitem>
@@ -5908,13 +5908,15 @@
file size limit.) If you want to keep down the pointer sizes
to make the index smaller and faster and you don't really need
big files, you can decrease the default pointer size by
- setting the <literal role="sysvar">myisam_data_pointer_size</literal> system
- variable. (See <xref linkend="server-system-variables"/>.) If
- you want all your tables to be able to grow above the default
- limit and are willing to have your tables slightly slower and
- larger than necessary, you can increase the default pointer
- size by setting this variable. Setting the value to 7 allows
- table sizes up to 65,536TB.
+ setting the
+ <literal role="sysvar">myisam_data_pointer_size</literal>
+ system variable. (See
+ <xref linkend="server-system-variables"/>.) If you want all
+ your tables to be able to grow above the default limit and are
+ willing to have your tables slightly slower and larger than
+ necessary, you can increase the default pointer size by
+ setting this variable. Setting the value to 7 allows table
+ sizes up to 65,536TB.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax-prepared-statements.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-prepared-statements.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/sql-syntax-prepared-statements.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 653 bytes
@@ -281,8 +281,9 @@
<para>
To guard against too many prepared statements being created
- simultaneously, the <literal role="sysvar">max_prepared_stmt_count</literal>
- system variable can be set.
+ simultaneously, the
+ <literal role="sysvar">max_prepared_stmt_count</literal> system
+ variable can be set.
</para>
<para>
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1261 bytes
@@ -1135,9 +1135,9 @@
maximum number of simultaneous connections that the account can
make. If <replaceable>count</replaceable> is
<literal>0</literal> (the default), the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
@@ -3645,7 +3645,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following two
statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
Modified: trunk/refman-5.1/stored-routines.xml
===================================================================
--- trunk/refman-5.1/stored-routines.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1/stored-routines.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1301 bytes
@@ -222,11 +222,12 @@
<para>
Recursion in stored procedures is allowed but disabled by default.
To enable recursion, set the
- <literal role="sysvar">max_sp_recursion_depth</literal> server system variable
- to a value greater than zero. Stored procedure recursion increases
- the demand on thread stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be necessary to
- increase thread stack size by increasing the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal> server
+ system variable to a value greater than zero. Stored procedure
+ recursion increases the demand on thread stack space. If you
+ increase the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
+ necessary to increase thread stack size by increasing the value of
<literal>thread_stack</literal> at server startup. See
<xref linkend="server-system-variables"/>, for more information.
</para>
Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1279 bytes
@@ -1135,9 +1135,9 @@
maximum number of simultaneous connections that the account can
make. If <replaceable>count</replaceable> is
<literal>0</literal> (the default), the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
@@ -3726,7 +3726,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following two
statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/data-types.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 8; 2315 bytes
@@ -4649,10 +4649,11 @@
<listitem>
<para>
- Only the first <literal role="sysvar">max_sort_length</literal> bytes of
+ Only the first
+ <literal role="sysvar">max_sort_length</literal> bytes of
the column are used when sorting. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024. This value can
- be changed using the
+ <literal role="sysvar">max_sort_length</literal> is 1024.
+ This value can be changed using the
<option>--max_sort_length=<replaceable>N</replaceable></option>
option when starting the <command>mysqld</command> server.
See <xref linkend="server-system-variables"/>.
@@ -4661,8 +4662,8 @@
<para>
You can make more bytes significant in sorting or grouping
by increasing the value of
- <literal role="sysvar">max_sort_length</literal> at runtime. Any client
- can change the value of its session
+ <literal role="sysvar">max_sort_length</literal> at runtime.
+ Any client can change the value of its session
<literal role="sysvar">max_sort_length</literal> variable:
</para>
@@ -4678,9 +4679,9 @@
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> column containing long
values when you want more than
- <literal role="sysvar">max_sort_length</literal> bytes to be significant
- is to convert the column value into a fixed-length object.
- The standard way to do this is with the
+ <literal role="sysvar">max_sort_length</literal> bytes to be
+ significant is to convert the column value into a
+ fixed-length object. The standard way to do this is with the
<literal role="func">SUBSTRING()</literal> function. For
example, the following statement causes 2000 bytes of the
<literal>comment</literal> column to be taken into account
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/dba-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 15, Lines Added: 74, Lines Deleted: 63; 12715 bytes
@@ -6922,7 +6922,8 @@
</para>
<para>
- If <literal role="sysvar">max_relay_log_size</literal> is 0, the value of
+ If <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the value of
<literal role="sysvar">max_binlog_size</literal> applies to
relay logs as well.
</para>
@@ -7145,15 +7146,16 @@
<para>
Do not allow <literal role="stmt">SELECT</literal>
statements that probably need to examine more than
- <literal role="sysvar">max_join_size</literal> rows (for single-table
- statements) or row combinations (for multiple-table
- statements) or that are likely to do more than
- <literal role="sysvar">max_join_size</literal> disk seeks. By setting this
- value, you can catch <literal role="stmt">SELECT</literal>
- statements where keys are not used properly and that would
- probably take a long time. Set it if your users tend to
- perform joins that lack a <literal>WHERE</literal> clause,
- that take a long time, or that return millions of rows.
+ <literal role="sysvar">max_join_size</literal> rows (for
+ single-table statements) or row combinations (for
+ multiple-table statements) or that are likely to do more
+ than <literal role="sysvar">max_join_size</literal> disk
+ seeks. By setting this value, you can catch
+ <literal role="stmt">SELECT</literal> statements where keys
+ are not used properly and that would probably take a long
+ time. Set it if your users tend to perform joins that lack a
+ <literal>WHERE</literal> clause, that take a long time, or
+ that return millions of rows.
</para>
<para>
@@ -7162,8 +7164,8 @@
<literal role="sysvar">sql_big_selects</literal> to
<literal>0</literal>. If you set the
<literal role="sysvar">sql_big_selects</literal> value
- again, the <literal role="sysvar">max_join_size</literal> variable is
- ignored.
+ again, the <literal role="sysvar">max_join_size</literal>
+ variable is ignored.
</para>
<para>
@@ -7251,14 +7253,17 @@
the current log file size to exceed the value of this
variable, the slave rotates the relay logs (closes the
current file and opens the next one). If
- <literal role="sysvar">max_relay_log_size</literal> is 0, the server uses
+ <literal role="sysvar">max_relay_log_size</literal> is 0,
+ the server uses
<literal role="sysvar">max_binlog_size</literal> for both
the binary log and the relay log. If
- <literal role="sysvar">max_relay_log_size</literal> is greater than 0, it
- constrains the size of the relay log, which enables you to
- have different sizes for the two logs. You must set
- <literal role="sysvar">max_relay_log_size</literal> to between 4096 bytes
- and 1GB (inclusive), or to 0. The default value is 0. See
+ <literal role="sysvar">max_relay_log_size</literal> is
+ greater than 0, it constrains the size of the relay log,
+ which enables you to have different sizes for the two logs.
+ You must set
+ <literal role="sysvar">max_relay_log_size</literal> to
+ between 4096 bytes and 1GB (inclusive), or to 0. The default
+ value is 0. See
<xref linkend="replication-implementation-details"/>.
</para>
</listitem>
@@ -7311,8 +7316,8 @@
The number of bytes to use when sorting
<literal role="type">BLOB</literal> or
<literal role="type">TEXT</literal> values. Only the first
- <literal role="sysvar">max_sort_length</literal> bytes of each value are
- used; the rest are ignored.
+ <literal role="sysvar">max_sort_length</literal> bytes of
+ each value are used; the rest are ignored.
</para>
</listitem>
@@ -7342,9 +7347,10 @@
<para>
Stored procedure recursion increases the demand on thread
stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
- necessary to increase thread stack size by increasing the
- value of <literal>thread_stack</literal> at server startup.
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it
+ may be necessary to increase thread stack size by increasing
+ the value of <literal>thread_stack</literal> at server
+ startup.
</para>
</listitem>
@@ -7609,10 +7615,10 @@
<para>
The maximum allowable setting for
- <literal role="sysvar">myisam_sort_buffer_size</literal> is 4GB. Values
- larger than 4GB are allowed for 64-bit platforms (except
- 64-bit Windows, for which large values are truncated to 4GB
- with a warning).
+ <literal role="sysvar">myisam_sort_buffer_size</literal> is
+ 4GB. Values larger than 4GB are allowed for 64-bit platforms
+ (except 64-bit Windows, for which large values are truncated
+ to 4GB with a warning).
</para>
</listitem>
@@ -10924,14 +10930,16 @@
likely to take a very long time to execute (that is,
statements for which the optimizer estimates that the number
of examined rows exceeds the value of
- <literal role="sysvar">max_join_size</literal>). This is useful when an
- inadvisable <literal>WHERE</literal> statement has been
- issued. The default value for a new connection is 1, which
- allows all <literal role="stmt">SELECT</literal> statements.
+ <literal role="sysvar">max_join_size</literal>). This is
+ useful when an inadvisable <literal>WHERE</literal>
+ statement has been issued. The default value for a new
+ connection is 1, which allows all
+ <literal role="stmt">SELECT</literal> statements.
</para>
<para>
- If you set the <literal role="sysvar">max_join_size</literal> system
+ If you set the
+ <literal role="sysvar">max_join_size</literal> system
variable to a value other than <literal>DEFAULT</literal>,
<literal role="sysvar">sql_big_selects</literal> is set to
0.
@@ -11453,7 +11461,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following
two statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
@@ -13160,7 +13169,8 @@
<para>
The current number of prepared statements. (The maximum
number of statements is given by the
- <literal role="sysvar">max_prepared_stmt_count</literal> system variable.)
+ <literal role="sysvar">max_prepared_stmt_count</literal>
+ system variable.)
</para>
</listitem>
@@ -18003,19 +18013,19 @@
The slow query log consists of all SQL statements that took more
than <literal role="sysvar">long_query_time</literal> seconds to
execute and (as of MySQL 6.0.4) required at least
- <literal role="sysvar">min_examined_row_limit</literal> rows to be examined.
- The time to acquire the initial table locks is not counted as
- execution time. <command>mysqld</command> writes a statement to
- the slow query log after it has been executed and after all
- locks have been released, so log order might be different from
- execution order. The minimum and default values of
- <literal role="sysvar">long_query_time</literal> are 1 and 10,
- respectively. Prior to MySQL 6.0.4, the minimum value is 1, and
- the value for this variable must be an integer. Beginning with
- MySQL 6.0.4, the minimum is 0, and a resolution of microseconds
- is supported when logging to a file. However, the microseconds
- part is ignored and only integer values are written when logging
- to tables.
+ <literal role="sysvar">min_examined_row_limit</literal> rows to
+ be examined. The time to acquire the initial table locks is not
+ counted as execution time. <command>mysqld</command> writes a
+ statement to the slow query log after it has been executed and
+ after all locks have been released, so log order might be
+ different from execution order. The minimum and default values
+ of <literal role="sysvar">long_query_time</literal> are 1 and
+ 10, respectively. Prior to MySQL 6.0.4, the minimum value is 1,
+ and the value for this variable must be an integer. Beginning
+ with MySQL 6.0.4, the minimum is 0, and a resolution of
+ microseconds is supported when logging to a file. However, the
+ microseconds part is ignored and only integer values are written
+ when logging to tables.
</para>
<para>
@@ -18933,8 +18943,8 @@
<para>
If you want to restrict the number of connections allowed to
a single account, you can do so by setting the
- <literal role="sysvar">max_user_connections</literal> variable in
- <command>mysqld</command>. The
+ <literal role="sysvar">max_user_connections</literal>
+ variable in <command>mysqld</command>. The
<literal role="stmt">GRANT</literal> statement also supports
resource control options for limiting the extent of server
use allowed to an account. See <xref linkend="grant"/>.
@@ -24164,14 +24174,14 @@
<para>
One means of limiting use of MySQL server resources is to set
- the <literal role="sysvar">max_user_connections</literal> system variable to a
- non-zero value. However, this method is strictly global, and
- does not allow for management of individual accounts. In
- addition, it limits only the number of simultaneous connections
- made using a single account, and not what a client can do once
- connected. Both types of control are of interest to many MySQL
- administrators, particularly those working for Internet Service
- Providers.
+ the <literal role="sysvar">max_user_connections</literal> system
+ variable to a non-zero value. However, this method is strictly
+ global, and does not allow for management of individual
+ accounts. In addition, it limits only the number of simultaneous
+ connections made using a single account, and not what a client
+ can do once connected. Both types of control are of interest to
+ many MySQL administrators, particularly those working for
+ Internet Service Providers.
</para>
<para>
@@ -24253,9 +24263,10 @@
limits are stored in the <literal>max_questions</literal>,
<literal>max_updates</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_user_connections</literal> columns. If your
- <literal>user</literal> table doesn't have these columns, it
- must be upgraded; see <xref linkend="mysql-upgrade"/>.
+ <literal role="sysvar">max_user_connections</literal> columns.
+ If your <literal>user</literal> table doesn't have these
+ columns, it must be upgraded; see
+ <xref linkend="mysql-upgrade"/>.
</para>
<para>
@@ -24289,9 +24300,9 @@
indicating the maximum number of simultaneous connections the
account can make at any one time. If the limit is set to the
default value of zero, the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/errors-problems.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 10; 2325 bytes
@@ -1841,11 +1841,12 @@
<para>
To change the default size limit for
<literal>MyISAM</literal> tables, set the
- <literal role="sysvar">myisam_data_pointer_size</literal>, which sets
- the number of bytes used for internal row pointers. The
- value is used to set the pointer size for new tables if
- you do not specify the <literal>MAX_ROWS</literal> option.
- The value of <literal role="sysvar">myisam_data_pointer_size</literal>
+ <literal role="sysvar">myisam_data_pointer_size</literal>,
+ which sets the number of bytes used for internal row
+ pointers. The value is used to set the pointer size for
+ new tables if you do not specify the
+ <literal>MAX_ROWS</literal> option. The value of
+ <literal role="sysvar">myisam_data_pointer_size</literal>
can be from 2 to 7. A value of 4 allows tables up to 4GB;
a value of 6 allows tables up to 256TB.
</para>
@@ -5417,11 +5418,12 @@
<literal role="type">TEXT</literal> values can't reliably
be used in <literal>GROUP BY</literal>, <literal>ORDER
BY</literal> or <literal>DISTINCT</literal>. Only the
- first <literal role="sysvar">max_sort_length</literal> bytes are used
- when comparing <literal role="type">BLOB</literal> values
- in these cases. The default value of
- <literal role="sysvar">max_sort_length</literal> is 1024 and can be
- changed at server startup time or at runtime.
+ first <literal role="sysvar">max_sort_length</literal>
+ bytes are used when comparing
+ <literal role="type">BLOB</literal> values in these cases.
+ The default value of
+ <literal role="sysvar">max_sort_length</literal> is 1024
+ and can be changed at server startup time or at runtime.
</para>
</listitem>
Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/optimization.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 10, Lines Added: 44, Lines Deleted: 36; 8064 bytes
@@ -1814,8 +1814,8 @@
of the <literal role="stmt">EXPLAIN</literal> output. This
should tell you roughly how many rows MySQL must examine to
execute the query. If you restrict queries with the
- <literal role="sysvar">max_join_size</literal> system variable, this row
- product also is used to determine which multiple-table
+ <literal role="sysvar">max_join_size</literal> system variable,
+ this row product also is used to determine which multiple-table
<literal role="stmt">SELECT</literal> statements to execute and
which to abort. See <xref linkend="server-parameters"/>.
</para>
@@ -5488,16 +5488,18 @@
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
tuple does not exceed the value of the
- <literal role="sysvar">max_length_for_sort_data</literal> system variable. (A
- symptom of setting the value of this variable too high is that
- you should see high disk activity and low CPU activity.)
+ <literal role="sysvar">max_length_for_sort_data</literal> system
+ variable. (A symptom of setting the value of this variable too
+ high is that you should see high disk activity and low CPU
+ activity.)
</para>
<para>
For slow queries for which <literal>filesort</literal> is not
used, you might try lowering
- <literal role="sysvar">max_length_for_sort_data</literal> to a value that is
- appropriate to trigger a <literal>filesort</literal>.
+ <literal role="sysvar">max_length_for_sort_data</literal> to a
+ value that is appropriate to trigger a
+ <literal>filesort</literal>.
</para>
<para>
@@ -8797,12 +8799,13 @@
<listitem>
<para>
You can start <command>mysqld</command> with a low value for
- the <literal role="sysvar">max_write_lock_count</literal> system variable
- to force MySQL to temporarily elevate the priority of all
- <literal role="stmt">SELECT</literal> statements that are
- waiting for a table after a specific number of inserts to
- the table occur. This allows <literal>READ</literal> locks
- after a certain number of <literal>WRITE</literal> locks.
+ the <literal role="sysvar">max_write_lock_count</literal>
+ system variable to force MySQL to temporarily elevate the
+ priority of all <literal role="stmt">SELECT</literal>
+ statements that are waiting for a table after a specific
+ number of inserts to the table occur. This allows
+ <literal>READ</literal> locks after a certain number of
+ <literal>WRITE</literal> locks.
</para>
</listitem>
@@ -10741,8 +10744,9 @@
<para>
For <literal>MyISAM</literal> tables, you have some control over
collection of table statistics by means of the
- <literal role="sysvar">myisam_stats_method</literal> system variable. This
- variable has two possible values, which differ as follows:
+ <literal role="sysvar">myisam_stats_method</literal> system
+ variable. This variable has two possible values, which differ as
+ follows:
</para>
<itemizedlist>
@@ -10803,9 +10807,9 @@
</para>
<para>
- The <literal role="sysvar">myisam_stats_method</literal> system variable has
- global and session values. Setting the global value affects
- <literal>MyISAM</literal> statistics collection for all
+ The <literal role="sysvar">myisam_stats_method</literal> system
+ variable has global and session values. Setting the global value
+ affects <literal>MyISAM</literal> statistics collection for all
<literal>MyISAM</literal> tables. Setting the session value
affects statistics collection only for the current client
connection. This means that you can force a table's statistics
@@ -10833,8 +10837,9 @@
<para>
Change the table to cause its statistics to go out of date
(for example, insert a row and then delete it), and then set
- <literal role="sysvar">myisam_stats_method</literal> and issue an
- <literal role="stmt">ANALYZE TABLE</literal> statement
+ <literal role="sysvar">myisam_stats_method</literal> and
+ issue an <literal role="stmt">ANALYZE TABLE</literal>
+ statement
</para>
</listitem>
@@ -10857,11 +10862,13 @@
(This may occur for bulk inserts or deletes, or some
<literal role="stmt">ALTER TABLE</literal> statements, for
example.) If this happens, the statistics are collected
- using whatever value <literal role="sysvar">myisam_stats_method</literal>
- has at the time. Thus, if you collect statistics using one
- method, but <literal role="sysvar">myisam_stats_method</literal> is set to
- the other method when a table's statistics are collected
- automatically later, the other method will be used.
+ using whatever value
+ <literal role="sysvar">myisam_stats_method</literal> has at
+ the time. Thus, if you collect statistics using one method,
+ but <literal role="sysvar">myisam_stats_method</literal> is
+ set to the other method when a table's statistics are
+ collected automatically later, the other method will be
+ used.
</para>
</listitem>
@@ -10874,10 +10881,11 @@
<listitem>
<para>
- <literal role="sysvar">myisam_stats_method</literal> applies only to
- <literal>MyISAM</literal> tables. Other storage engines have
- only one method for collecting table statistics. Usually it
- is closer to the <literal>nulls_equal</literal> method.
+ <literal role="sysvar">myisam_stats_method</literal> applies
+ only to <literal>MyISAM</literal> tables. Other storage
+ engines have only one method for collecting table
+ statistics. Usually it is closer to the
+ <literal>nulls_equal</literal> method.
</para>
</listitem>
@@ -10956,11 +10964,11 @@
<para>
The <literal>table_open_cache</literal>,
<literal role="sysvar">max_connections</literal>, and
- <literal role="sysvar">max_tmp_tables</literal> system variables affect the
- maximum number of files the server keeps open. If you increase
- one or more of these values, you may run up against a limit
- imposed by your operating system on the per-process number of
- open file descriptors. Many operating systems allow you to
+ <literal role="sysvar">max_tmp_tables</literal> system variables
+ affect the maximum number of files the server keeps open. If you
+ increase one or more of these values, you may run up against a
+ limit imposed by your operating system on the per-process number
+ of open file descriptors. Many operating systems allow you to
increase the open-files limit, although the method varies widely
from system to system. Consult your operating system
documentation to determine whether it is possible to increase
@@ -16505,8 +16513,8 @@
<listitem>
<para>
- The <literal role="sysvar">myisam_use_mmap</literal> system variable can
- be set to 1 to enable memory-mapping for all
+ The <literal role="sysvar">myisam_use_mmap</literal> system
+ variable can be set to 1 to enable memory-mapping for all
<literal>MyISAM</literal> tables.
</para>
</listitem>
Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/partitioning.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1165 bytes
@@ -4396,10 +4396,11 @@
<literal>open_files_limit</literal> is set properly.
For partitioned tables using the
<literal>MyISAM</literal> storage engine, increasing
- <literal role="sysvar">myisam_max_sort_file_size</literal> may
- improve performance; partitioning and repartitioning
- operations involving <literal>InnoDB</literal>
- tables may be made more efficient by enabling
+ <literal role="sysvar">myisam_max_sort_file_size</literal>
+ may improve performance; partitioning and
+ repartitioning operations involving
+ <literal>InnoDB</literal> tables may be made more
+ efficient by enabling
<literal>innodb_file_per_table</literal>.
</para>
Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/programs-admin-util-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 1132 bytes
@@ -903,15 +903,16 @@
</para>
<para>
- <literal role="sysvar">myisam_block_size</literal> is the size used for index
- blocks.
+ <literal role="sysvar">myisam_block_size</literal> is the size
+ used for index blocks.
</para>
<para>
<literal>stats_method</literal> influences how
<literal>NULL</literal> values are treated for index statistics
collection when the <option>--analyze</option> option is given.
- It acts like the <literal role="sysvar">myisam_stats_method</literal> system
+ It acts like the
+ <literal role="sysvar">myisam_stats_method</literal> system
variable. For more information, see the description of
<literal role="sysvar">myisam_stats_method</literal> in
<xref linkend="server-system-variables"/>, and
Modified: trunk/refman-6.0/replication-implementation.xml
===================================================================
--- trunk/refman-6.0/replication-implementation.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/replication-implementation.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 1058 bytes
@@ -417,14 +417,16 @@
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
greater than 0, that is the maximum relay log file size.
</para>
</listitem>
<listitem>
<para>
- If the value of <literal role="sysvar">max_relay_log_size</literal> is
+ If the value of
+ <literal role="sysvar">max_relay_log_size</literal> is
0, <literal role="sysvar">max_binlog_size</literal>
determines the maximum relay log file size.
</para>
Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/replication-options-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 983 bytes
@@ -408,9 +408,10 @@
numeric suffix to the basename. You can specify the option to
create hostname-independent relay log names, or if your relay
logs tend to be big (and you don't want to decrease
- <literal role="sysvar">max_relay_log_size</literal>) and you need to put them
- in some area different from the data directory, or if you want
- to increase speed by balancing load between disks.
+ <literal role="sysvar">max_relay_log_size</literal>) and you
+ need to put them in some area different from the data directory,
+ or if you want to increase speed by balancing load between
+ disks.
</para>
</listitem>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/se-innodb-core.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 970 bytes
@@ -8530,9 +8530,9 @@
values good enough for your particular tables, you can use
<literal>FORCE INDEX</literal> with your queries to force the
use of a particular index, or set the
- <literal role="sysvar">max_seeks_for_key</literal> system variable to ensure
- that MySQL prefers index lookups over table scans. See
- <xref linkend="server-system-variables"/>, and
+ <literal role="sysvar">max_seeks_for_key</literal> system
+ variable to ensure that MySQL prefers index lookups over table
+ scans. See <xref linkend="server-system-variables"/>, and
<xref linkend="optimizer-issues"/>.
</para>
</listitem>
Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 11; 2489 bytes
@@ -780,8 +780,8 @@
wouldn't strictly need to be copied. For <literal>MyISAM</literal>
tables, you can speed up the index re-creation operation (which is
the slowest part of the alteration process) by setting the
- <literal role="sysvar">myisam_sort_buffer_size</literal> system variable to a
- high value.
+ <literal role="sysvar">myisam_sort_buffer_size</literal> system
+ variable to a high value.
</para>
<para>
@@ -4678,8 +4678,8 @@
<literal role="type">BLOB</literal> column in a
<literal role="stmt">SELECT</literal>, the server sorts values
using only the initial number of bytes indicated by the
- <literal role="sysvar">max_sort_length</literal> system variable. See
- <xref linkend="blob"/>.
+ <literal role="sysvar">max_sort_length</literal> system
+ variable. See <xref linkend="blob"/>.
</para>
</listitem>
@@ -4990,13 +4990,15 @@
file size limit.) If you want to keep down the pointer sizes
to make the index smaller and faster and you don't really need
big files, you can decrease the default pointer size by
- setting the <literal role="sysvar">myisam_data_pointer_size</literal> system
- variable. (See <xref linkend="server-system-variables"/>.) If
- you want all your tables to be able to grow above the default
- limit and are willing to have your tables slightly slower and
- larger than necessary, you can increase the default pointer
- size by setting this variable. Setting the value to 7 allows
- table sizes up to 65,536TB.
+ setting the
+ <literal role="sysvar">myisam_data_pointer_size</literal>
+ system variable. (See
+ <xref linkend="server-system-variables"/>.) If you want all
+ your tables to be able to grow above the default limit and are
+ willing to have your tables slightly slower and larger than
+ necessary, you can increase the default pointer size by
+ setting this variable. Setting the value to 7 allows table
+ sizes up to 65,536TB.
</para>
</listitem>
Modified: trunk/refman-6.0/sql-syntax-prepared-statements.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-prepared-statements.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/sql-syntax-prepared-statements.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 653 bytes
@@ -281,8 +281,9 @@
<para>
To guard against too many prepared statements being created
- simultaneously, the <literal role="sysvar">max_prepared_stmt_count</literal>
- system variable can be set.
+ simultaneously, the
+ <literal role="sysvar">max_prepared_stmt_count</literal> system
+ variable can be set.
</para>
<para>
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1261 bytes
@@ -1145,9 +1145,9 @@
maximum number of simultaneous connections that the account can
make. If <replaceable>count</replaceable> is
<literal>0</literal> (the default), the
- <literal role="sysvar">max_user_connections</literal> system variable
- determines the number of simultaneous connections for the
- account.
+ <literal role="sysvar">max_user_connections</literal> system
+ variable determines the number of simultaneous connections for
+ the account.
</para>
<para>
@@ -3882,7 +3882,8 @@
value to the compiled-in MySQL default value, use the
<literal>DEFAULT</literal> keyword. For example, the following two
statements are identical in setting the session value of
- <literal role="sysvar">max_join_size</literal> to the global value:
+ <literal role="sysvar">max_join_size</literal> to the global
+ value:
</para>
<programlisting>
Modified: trunk/refman-6.0/stored-routines.xml
===================================================================
--- trunk/refman-6.0/stored-routines.xml 2008-12-02 02:57:31 UTC (rev 12727)
+++ trunk/refman-6.0/stored-routines.xml 2008-12-02 02:57:56 UTC (rev 12728)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1301 bytes
@@ -222,11 +222,12 @@
<para>
Recursion in stored procedures is allowed but disabled by default.
To enable recursion, set the
- <literal role="sysvar">max_sp_recursion_depth</literal> server system variable
- to a value greater than zero. Stored procedure recursion increases
- the demand on thread stack space. If you increase the value of
- <literal role="sysvar">max_sp_recursion_depth</literal>, it may be necessary to
- increase thread stack size by increasing the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal> server
+ system variable to a value greater than zero. Stored procedure
+ recursion increases the demand on thread stack space. If you
+ increase the value of
+ <literal role="sysvar">max_sp_recursion_depth</literal>, it may be
+ necessary to increase thread stack size by increasing the value of
<literal>thread_stack</literal> at server startup. See
<xref linkend="server-system-variables"/>, for more information.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12728 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 | paul.dubois | 2 Dec |
