Author: paul
Date: 2009-03-17 18:18:58 +0100 (Tue, 17 Mar 2009)
New Revision: 14267
Log:
r39662@frost: paul | 2009-03-17 12:11:54 -0500
Harmonize some version differences, add markup
Modified:
trunk/refman-4.1/dba-mysqld-server-core.xml
trunk/refman-4.1/news-4.0.xml
trunk/refman-5.0/dba-mysqld-server-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:39641
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:37228
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:39662
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:37228
Modified: trunk/refman-4.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-4.1/dba-mysqld-server-core.xml 2009-03-17 17:16:52 UTC (rev 14266)
+++ trunk/refman-4.1/dba-mysqld-server-core.xml 2009-03-17 17:18:58 UTC (rev 14267)
Changed blocks: 7, Lines Added: 55, Lines Deleted: 22; 5235 bytes
@@ -1463,8 +1463,6 @@
<option role="mysqld">--myisam-block-size=<replaceable>N</replaceable></option>
</para>
- <para condition="dynamic:optvar:item" role="4.1:mysqld:myisam-block-size"/>
-
<para>
The block size to be used for <literal>MyISAM</literal> index
pages.
@@ -6208,8 +6206,6 @@
<literal role="sysvar">plugin_dir</literal>
</para>
- <para condition="dynamic:optvar:item" role="5.0:mysqld:plugin_dir"/>
-
<para>
The path name of the plugin directory. This variable was added
in MySQL 4.1.25. If the value is non-empty, user-defined
@@ -6669,8 +6665,48 @@
</listitem>
<listitem>
+ <para id="sysvar_relay_log_purge">
+ <indexterm>
+ <primary>relay_log_purge system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>relay_log_purge</secondary>
+ </indexterm>
+
+ <literal role="sysvar">relay_log_purge</literal>
+ </para>
+
<para>
+ Disables or enables automatic purging of relay log files as
+ soon as they are not needed any more. The default value is 1
+ (<literal>ON</literal>).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="sysvar_relay_log_space_limit">
<indexterm>
+ <primary>relay_log_space_limit system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>relay_log_space_limit</secondary>
+ </indexterm>
+
+ <literal role="sysvar">relay_log_space_limit</literal>
+ </para>
+
+ <para>
+ The maximum amount of space to use for all relay logs.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="sysvar_safe_show_database">
+ <indexterm>
<primary>safe_show_database system variable</primary>
</indexterm>
@@ -6679,7 +6715,7 @@
<secondary>safe_show_database</secondary>
</indexterm>
- <literal>safe_show_database</literal>
+ <literal role="sysvar">safe_show_database</literal>
</para>
<para>
@@ -6748,8 +6784,6 @@
<literal role="sysvar">server_id</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
-
<para>
The server ID, used in replication to give each master and
slave a unique identity. This variable is set by the
@@ -6881,19 +6915,20 @@
<literal role="priv">SHOW DATABASES</literal> privilege. This
can improve security if you are concerned about people being
able to see what databases other users have. See also
- <literal>safe_show_database</literal>. This variable was added
- in MySQL 3.23.4. As of MySQL 4.0.2, its effect also depends on
- the <literal role="priv">SHOW DATABASES</literal> privilege:
- If the variable value is <literal>ON</literal>, the
- <literal role="stmt">SHOW DATABASES</literal> statement is
- allowed only to users who have the <literal role="priv">SHOW
- DATABASES</literal> privilege, and the statement displays all
- database names. If the value is <literal>OFF</literal>,
- <literal role="stmt">SHOW DATABASES</literal> is allowed to
- all users, but displays each database name only if the user
- has the <literal role="priv">SHOW DATABASES</literal>
- privilege or some privilege for the database. Note that any
- global privilege is a privilege for the database.
+ <literal role="sysvar">safe_show_database</literal>. This
+ variable was added in MySQL 3.23.4. As of MySQL 4.0.2, its
+ effect also depends on the <literal role="priv">SHOW
+ DATABASES</literal> privilege: If the variable value is
+ <literal>ON</literal>, the <literal role="stmt">SHOW
+ DATABASES</literal> statement is allowed only to users who
+ have the <literal role="priv">SHOW DATABASES</literal>
+ privilege, and the statement displays all database names. If
+ the value is <literal>OFF</literal>, <literal role="stmt">SHOW
+ DATABASES</literal> is allowed to all users, but displays each
+ database name only if the user has the
+ <literal role="priv">SHOW DATABASES</literal> privilege or
+ some privilege for the database. Note that any global
+ privilege is a privilege for the database.
</para>
</listitem>
@@ -7005,8 +7040,6 @@
<literal role="sysvar">sql_select_limit</literal>
</para>
- <para condition="dynamic:optvar:item" role="5.0:mysqld:sql_select_limit"/>
-
<para>
The maximum number of rows to return from
<literal role="stmt">SELECT</literal> statements. The default
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2009-03-17 17:16:52 UTC (rev 14266)
+++ trunk/refman-4.1/news-4.0.xml 2009-03-17 17:18:58 UTC (rev 14267)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 559 bytes
@@ -7542,8 +7542,9 @@
<listitem>
<para>
- Removed variable <literal>safe_show_database</literal> as it
- was no longer used.
+ Removed variable
+ <literal role="sysvar">safe_show_database</literal> as it was
+ no longer used.
</para>
</listitem>
Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml 2009-03-17 17:16:52 UTC (rev 14266)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml 2009-03-17 17:18:58 UTC (rev 14267)
Changed blocks: 1, Lines Added: 44, Lines Deleted: 0; 1779 bytes
@@ -7511,6 +7511,50 @@
</listitem>
<listitem>
+ <para id="sysvar_relay_log_purge">
+ <indexterm>
+ <primary>relay_log_purge system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>relay_log_purge</secondary>
+ </indexterm>
+
+ <literal role="sysvar">relay_log_purge</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_purge"/>
+
+ <para>
+ Disables or enables automatic purging of relay log files as
+ soon as they are not needed any more. The default value is 1
+ (<literal>ON</literal>).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="sysvar_relay_log_space_limit">
+ <indexterm>
+ <primary>relay_log_space_limit system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>relay_log_space_limit</secondary>
+ </indexterm>
+
+ <literal role="sysvar">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="sysvar_secure_auth">
<indexterm>
<primary>secure_auth system variable</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r14267 - in trunk: . refman-4.1 refman-5.0 | paul.dubois | 17 Mar |
