Author: paul
Date: 2008-04-25 18:59:24 +0200 (Fri, 25 Apr 2008)
New Revision: 10593
Log:
r30978@frost: paul | 2008-04-25 11:57:47 -0500
Several corrections to system variable descriptions or ordering.
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/it/refman-5.1/dba-core.xml
trunk/pt/refman-5.1/dba-core.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30972
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30933
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30978
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30933
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 13; 2825 bytes
@@ -5116,7 +5116,7 @@
<name>auto_increment_offset</name>
<shortdescription lang="en">
- Offset added to Auto-increment columns
+ Offset added to auto-increment columns
</shortdescription>
<seealso xref="auto-increment-increment"/>
@@ -5242,8 +5242,7 @@
<name>basedir</name>
<shortdescription lang="en">
- Path to installation directory. All paths are usually resolved
- relative to this
+ Path to installation directory
</shortdescription>
<seealso xref="datadir"/>
@@ -5302,7 +5301,7 @@
<name>bdb-home</name>
<shortdescription lang="en">
- Berkeley home directory
+ Berkeley DB home directory
</shortdescription>
<types>
@@ -5327,7 +5326,7 @@
<name>bdb-lock-detect</name>
<shortdescription lang="en">
- Berkeley lock detect
+ Berkeley DB lock detect
</shortdescription>
<types>
@@ -5905,8 +5904,7 @@
<name>character-set-server</name>
<shortdescription lang="en">
- Set the default collation (deprecated option, use instead).
- --default-collation=name
+ Set the default character set
</shortdescription>
<seealso xref="collation-server"/>
@@ -7761,7 +7759,7 @@
<name>init_connect</name>
<shortdescription lang="en">
- Command(s) that are executed for each new connection
+ Statements that are executed for each new connection
</shortdescription>
<types>
@@ -12280,9 +12278,7 @@
<name>max_error_count</name>
<shortdescription lang="en">
- Max number of errors/warnings to store for a statement.
- --max_heap_table_size=# Don't allow creation of heap tables bigger
- than this
+ Max number of errors/warnings to store for a statement
</shortdescription>
<types>
@@ -12569,7 +12565,7 @@
<name>max_sp_recursion_depth</name>
<shortdescription lang="en">
- Maximum stored procedure recursion depth. (discussed with docs)
+ Maximum stored procedure recursion depth
</shortdescription>
<types>
@@ -13307,7 +13303,7 @@
<name>ndb_autoincrement_prefetch_sz</name>
<shortdescription lang="en">
- NDB Auto-increment prefetch size
+ NDB auto-increment prefetch size
</shortdescription>
<types>
@@ -16627,6 +16623,7 @@
<choice value="NO_ZERO_DATE"/>
<choice value="NO_ZERO_IN_DATE"/>
<choice value="ONLY_FULL_GROUP_BY"/>
+ <choice value="PAD_CHAR_TO_FULL_LENGTH"/>
<choice value="PIPES_AS_CONCAT"/>
<choice value="REAL_AS_FLOAT"/>
<choice value="STRICT_ALL_TABLES"/>
Modified: trunk/it/refman-5.1/dba-core.xml
===================================================================
--- trunk/it/refman-5.1/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/it/refman-5.1/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 20; 5520 bytes
@@ -3413,7 +3413,7 @@
<literal>auto_increment_offset</literal> are intended for
use with master-to-master replication, and can be used to
control the operation of <literal>AUTO_INCREMENT</literal>
- columns. Both variables can be set globally or locally, and
+ columns. Both variables have global and session values, and
each can assume an integer value between 1 and 65,535
inclusive. Setting the value of either of these two
variables to 0 causes its value to be set to 1 instead.
@@ -3632,17 +3632,16 @@
</para>
<para>
- It is important to remember that it is not possible to
- confine the effects of these two variables to a single
- table, and thus they do not take the place of the sequences
- offered by some other database management systems; these
- variables control the behavior of all
- <literal>AUTO_INCREMENT</literal> columns in
- <emphasis>all</emphasis> tables on the MySQL server. If one
- of these variables is set globally, its effects persist
+ It is not possible to confine the effects of these two
+ variables to a single table, and thus they do not take the
+ place of the sequences offered by some other database
+ management systems; these variables control the behavior of
+ all <literal>AUTO_INCREMENT</literal> columns in
+ <emphasis>all</emphasis> tables on the MySQL server. If the
+ global value of either variable is set, its effects persist
until the global value is changed or overridden by setting
- them locally, or until <command>mysqld</command> is
- restarted. If set locally, the new value affects
+ the session value, or until <command>mysqld</command> is
+ restarted. If the local value is set, the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for the
duration of the session, unless the values are changed
@@ -3699,11 +3698,11 @@
and <literal>ALTER ROUTINE</literal> privileges to the
creator of a stored routine, if the user cannot already
execute and alter or drop the routine. (The <literal>ALTER
- ROUTINE</literal> privileges is required to drop the
+ ROUTINE</literal> privilege is required to drop the
routine.) The server also automatically drops those
privileges when the creator drops the routine. If
<literal>automatic_sp_privileges</literal> is 0, the server
- does not automatically add and drop these privileges.
+ does not automatically add or drop these privileges.
</para>
</listitem>
@@ -3747,7 +3746,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -4187,7 +4188,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -4199,7 +4200,7 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:datetime_format"/>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -6622,12 +6623,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -6845,7 +6846,19 @@
</listitem>
<listitem>
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_space_limit"/>
+
<para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>report_host</literal>
</para>
@@ -7607,7 +7620,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
Modified: trunk/pt/refman-5.1/dba-core.xml
===================================================================
--- trunk/pt/refman-5.1/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/pt/refman-5.1/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 20; 5520 bytes
@@ -3413,7 +3413,7 @@
<literal>auto_increment_offset</literal> are intended for
use with master-to-master replication, and can be used to
control the operation of <literal>AUTO_INCREMENT</literal>
- columns. Both variables can be set globally or locally, and
+ columns. Both variables have global and session values, and
each can assume an integer value between 1 and 65,535
inclusive. Setting the value of either of these two
variables to 0 causes its value to be set to 1 instead.
@@ -3632,17 +3632,16 @@
</para>
<para>
- It is important to remember that it is not possible to
- confine the effects of these two variables to a single
- table, and thus they do not take the place of the sequences
- offered by some other database management systems; these
- variables control the behavior of all
- <literal>AUTO_INCREMENT</literal> columns in
- <emphasis>all</emphasis> tables on the MySQL server. If one
- of these variables is set globally, its effects persist
+ It is not possible to confine the effects of these two
+ variables to a single table, and thus they do not take the
+ place of the sequences offered by some other database
+ management systems; these variables control the behavior of
+ all <literal>AUTO_INCREMENT</literal> columns in
+ <emphasis>all</emphasis> tables on the MySQL server. If the
+ global value of either variable is set, its effects persist
until the global value is changed or overridden by setting
- them locally, or until <command>mysqld</command> is
- restarted. If set locally, the new value affects
+ the session value, or until <command>mysqld</command> is
+ restarted. If the local value is set, the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for the
duration of the session, unless the values are changed
@@ -3699,11 +3698,11 @@
and <literal>ALTER ROUTINE</literal> privileges to the
creator of a stored routine, if the user cannot already
execute and alter or drop the routine. (The <literal>ALTER
- ROUTINE</literal> privileges is required to drop the
+ ROUTINE</literal> privilege is required to drop the
routine.) The server also automatically drops those
privileges when the creator drops the routine. If
<literal>automatic_sp_privileges</literal> is 0, the server
- does not automatically add and drop these privileges.
+ does not automatically add or drop these privileges.
</para>
</listitem>
@@ -3747,7 +3746,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -4187,7 +4188,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -4199,7 +4200,7 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:datetime_format"/>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -6622,12 +6623,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -6845,7 +6846,19 @@
</listitem>
<listitem>
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_space_limit"/>
+
<para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>report_host</literal>
</para>
@@ -7607,7 +7620,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/refman-4.1/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 6, Lines Added: 31, Lines Deleted: 17; 3055 bytes
@@ -3037,7 +3037,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -3438,7 +3440,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -5343,12 +5345,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -5522,7 +5524,29 @@
</listitem>
<listitem>
- <para id="option_mysqld_show_databases">
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_space_limit"/>
+
+ <para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="option_mysqld_rpl-recovery-rank">
+ <literal>rpl_recovery_rank</literal>
+ </para>
+
+ <para>
+ This variable is unused.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>safe_show_database</literal>
</para>
@@ -5543,16 +5567,6 @@
</listitem>
<listitem>
- <para id="option_mysqld_rpl-recovery-rank">
- <literal>rpl_recovery_rank</literal>
- </para>
-
- <para>
- This variable is unused.
- </para>
- </listitem>
-
- <listitem>
<para id="option_mysqld_secure_auth">
<literal>secure_auth</literal>
</para>
@@ -6015,7 +6029,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/refman-5.0/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 20; 5543 bytes
@@ -3260,7 +3260,7 @@
<literal>auto_increment_offset</literal> are intended for
use with master-to-master replication, and can be used to
control the operation of <literal>AUTO_INCREMENT</literal>
- columns. Both variables can be set globally or locally, and
+ columns. Both variables have global and session values, and
each can assume an integer value between 1 and 65,535
inclusive. Setting the value of either of these two
variables to 0 causes its value to be set to 1 instead.
@@ -3467,17 +3467,16 @@
</para>
<para>
- It is important to remember that it is not possible to
- confine the effects of these two variables to a single
- table, and thus they do not take the place of the sequences
- offered by some other database management systems; these
- variables control the behavior of all
- <literal>AUTO_INCREMENT</literal> columns in
- <emphasis>all</emphasis> tables on the MySQL server. If one
- of these variables is set globally, its effects persist
+ It is not possible to confine the effects of these two
+ variables to a single table, and thus they do not take the
+ place of the sequences offered by some other database
+ management systems; these variables control the behavior of
+ all <literal>AUTO_INCREMENT</literal> columns in
+ <emphasis>all</emphasis> tables on the MySQL server. If the
+ global value of either variable is set, its effects persist
until the global value is changed or overridden by setting
- them locally, or until <command>mysqld</command> is
- restarted. If set locally, the new value affects
+ the session value, or until <command>mysqld</command> is
+ restarted. If the local value is set, the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for the
duration of the session, unless the values are changed
@@ -3532,11 +3531,11 @@
and <literal>ALTER ROUTINE</literal> privileges to the
creator of a stored routine, if the user cannot already
execute and alter or drop the routine. (The <literal>ALTER
- ROUTINE</literal> privileges is required to drop the
+ ROUTINE</literal> privilege is required to drop the
routine.) The server also automatically drops those
privileges when the creator drops the routine. If
<literal>automatic_sp_privileges</literal> is 0, the server
- does not automatically add and drop these privileges. This
+ does not automatically add or drop these privileges. This
variable was added in MySQL 5.0.3.
</para>
</listitem>
@@ -3581,7 +3580,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -4063,7 +4064,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -4073,7 +4074,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -6330,12 +6331,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -6514,6 +6515,18 @@
</listitem>
<listitem>
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_space_limit"/>
+
+ <para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_rpl-recovery-rank">
<literal>rpl_recovery_rank</literal>
</para>
@@ -7122,7 +7135,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/refman-5.1/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 20; 5511 bytes
@@ -3429,7 +3429,7 @@
<literal>auto_increment_offset</literal> are intended for
use with master-to-master replication, and can be used to
control the operation of <literal>AUTO_INCREMENT</literal>
- columns. Both variables can be set globally or locally, and
+ columns. Both variables have global and session values, and
each can assume an integer value between 1 and 65,535
inclusive. Setting the value of either of these two
variables to 0 causes its value to be set to 1 instead.
@@ -3648,17 +3648,16 @@
</para>
<para>
- It is important to remember that it is not possible to
- confine the effects of these two variables to a single
- table, and thus they do not take the place of the sequences
- offered by some other database management systems; these
- variables control the behavior of all
- <literal>AUTO_INCREMENT</literal> columns in
- <emphasis>all</emphasis> tables on the MySQL server. If one
- of these variables is set globally, its effects persist
+ It is not possible to confine the effects of these two
+ variables to a single table, and thus they do not take the
+ place of the sequences offered by some other database
+ management systems; these variables control the behavior of
+ all <literal>AUTO_INCREMENT</literal> columns in
+ <emphasis>all</emphasis> tables on the MySQL server. If the
+ global value of either variable is set, its effects persist
until the global value is changed or overridden by setting
- them locally, or until <command>mysqld</command> is
- restarted. If set locally, the new value affects
+ the session value, or until <command>mysqld</command> is
+ restarted. If the local value is set, the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for the
duration of the session, unless the values are changed
@@ -3715,11 +3714,11 @@
and <literal>ALTER ROUTINE</literal> privileges to the
creator of a stored routine, if the user cannot already
execute and alter or drop the routine. (The <literal>ALTER
- ROUTINE</literal> privileges is required to drop the
+ ROUTINE</literal> privilege is required to drop the
routine.) The server also automatically drops those
privileges when the creator drops the routine. If
<literal>automatic_sp_privileges</literal> is 0, the server
- does not automatically add and drop these privileges.
+ does not automatically add or drop these privileges.
</para>
</listitem>
@@ -3763,7 +3762,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -4203,7 +4204,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -4215,7 +4216,7 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:datetime_format"/>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -6638,12 +6639,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -6861,7 +6862,19 @@
</listitem>
<listitem>
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_space_limit"/>
+
<para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>report_host</literal>
</para>
@@ -7623,7 +7636,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-04-25 15:22:37 UTC (rev 10592)
+++ trunk/refman-6.0/dba-core.xml 2008-04-25 16:59:24 UTC (rev 10593)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 20; 5511 bytes
@@ -3395,7 +3395,7 @@
<literal>auto_increment_offset</literal> are intended for
use with master-to-master replication, and can be used to
control the operation of <literal>AUTO_INCREMENT</literal>
- columns. Both variables can be set globally or locally, and
+ columns. Both variables have global and session values, and
each can assume an integer value between 1 and 65,535
inclusive. Setting the value of either of these two
variables to 0 causes its value to be set to 1 instead.
@@ -3614,17 +3614,16 @@
</para>
<para>
- It is important to remember that it is not possible to
- confine the effects of these two variables to a single
- table, and thus they do not take the place of the sequences
- offered by some other database management systems; these
- variables control the behavior of all
- <literal>AUTO_INCREMENT</literal> columns in
- <emphasis>all</emphasis> tables on the MySQL server. If one
- of these variables is set globally, its effects persist
+ It is not possible to confine the effects of these two
+ variables to a single table, and thus they do not take the
+ place of the sequences offered by some other database
+ management systems; these variables control the behavior of
+ all <literal>AUTO_INCREMENT</literal> columns in
+ <emphasis>all</emphasis> tables on the MySQL server. If the
+ global value of either variable is set, its effects persist
until the global value is changed or overridden by setting
- them locally, or until <command>mysqld</command> is
- restarted. If set locally, the new value affects
+ the session value, or until <command>mysqld</command> is
+ restarted. If the local value is set, the new value affects
<literal>AUTO_INCREMENT</literal> columns for all tables
into which new rows are inserted by the current user for the
duration of the session, unless the values are changed
@@ -3665,11 +3664,11 @@
and <literal>ALTER ROUTINE</literal> privileges to the
creator of a stored routine, if the user cannot already
execute and alter or drop the routine. (The <literal>ALTER
- ROUTINE</literal> privileges is required to drop the
+ ROUTINE</literal> privilege is required to drop the
routine.) The server also automatically drops those
privileges when the creator drops the routine. If
<literal>automatic_sp_privileges</literal> is 0, the server
- does not automatically add and drop these privileges.
+ does not automatically add or drop these privileges.
</para>
</listitem>
@@ -3713,7 +3712,9 @@
<para>
The MySQL installation base directory. This variable can be
- set with the <option>--basedir</option> option.
+ set with the <option>--basedir</option> option. Relative
+ pathnames for other variables usually are resolved relative
+ to the base directory.
</para>
</listitem>
@@ -4141,7 +4142,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -4153,7 +4154,7 @@
<para condition="dynamic:optvar:item" role="6.0:mysqld:datetime_format"/>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
@@ -6500,12 +6501,12 @@
</row>
<row>
<entry><literal>1</literal> or <literal>ON</literal></entry>
- <entry>Cache all query results except for those that begin with <literal>SELECT
- SQL_NO_CACHE</literal>.</entry>
+ <entry>Cache all cacheable query results except for those that begin with
+ <literal>SELECT SQL_NO_CACHE</literal>.</entry>
</row>
<row>
<entry><literal>2</literal> or <literal>DEMAND</literal></entry>
- <entry>Cache results only for queries that begin with <literal>SELECT
+ <entry>Cache results only for cacheable queries that begin with <literal>SELECT
SQL_CACHE</literal>.</entry>
</row>
</tbody>
@@ -6723,7 +6724,19 @@
</listitem>
<listitem>
+ <para id="option_mysqld_relay_log_space_limit">
+ <literal>relay_log_space_limit</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_space_limit"/>
+
<para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>report_host</literal>
</para>
@@ -7471,7 +7484,7 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10593 - in trunk: . dynamic-docs/command-optvars it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6... | paul | 25 Apr |
