Author: paul
Date: 2008-12-04 04:12:48 +0100 (Thu, 04 Dec 2008)
New Revision: 12764
Log:
r36403@frost: paul | 2008-12-03 20:30:56 -0500
Convert some system variable IDs
Add auto-link markup
Modified:
trunk/dynamic-docs/changelog/connector-j.xml
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/mysql-monitor/data-items.xml
trunk/refman-4.1/backup.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/introduction.xml
trunk/refman-4.1/news-3.22.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/sql-syntax-replication.xml
trunk/refman-5.0/backup.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/information-schema.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/precision-math.xml
trunk/refman-5.0/programs-admin-util-core.xml
trunk/refman-5.0/replication-configuration.xml
trunk/refman-5.0/replication-notes.xml
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.0/sql-syntax-data-definition.xml
trunk/refman-5.0/sql-syntax-replication.xml
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.1-maria/sql-syntax-server-administration.xml
trunk/refman-5.1/backup.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/functions-core.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/installing-core.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/mysql-cluster-replication.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/precision-math.xml
trunk/refman-5.1/programs-admin-util-core.xml
trunk/refman-5.1/replication-configuration.xml
trunk/refman-5.1/replication-notes.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/replication-solutions.xml
trunk/refman-5.1/sql-syntax-data-definition.xml
trunk/refman-5.1/sql-syntax-replication.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-6.0/backup.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/functions-core.xml
trunk/refman-6.0/information-schema.xml
trunk/refman-6.0/introduction.xml
trunk/refman-6.0/optimization.xml
trunk/refman-6.0/precision-math.xml
trunk/refman-6.0/programs-admin-util-core.xml
trunk/refman-6.0/replication-configuration.xml
trunk/refman-6.0/replication-notes.xml
trunk/refman-6.0/replication-solutions.xml
trunk/refman-6.0/sql-syntax-data-definition.xml
trunk/refman-6.0/sql-syntax-replication.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
trunk/refman-common/bug-reports.xml
trunk/refman-common/connector-odbc.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:36398
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34988
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36403
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34988
Modified: trunk/dynamic-docs/changelog/connector-j.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-j.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/dynamic-docs/changelog/connector-j.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1000 bytes
@@ -6127,7 +6127,7 @@
<message>
<para>
- Detect new <literal>sql_mode</literal> variable in string form
+ Detect new <literal role="sysvar">sql_mode</literal> variable in string form
(it used to be integer) and adjust quoting method for strings
appropriately.
</para>
@@ -13146,7 +13146,7 @@
<para>
<literal>PreparedStatement.setString()</literal> didn't work
- correctly when <literal>sql_mode</literal> on server contained
+ correctly when <literal role="sysvar">sql_mode</literal> on server contained
<literal>NO_BACKSLASH_ESCAPES</literal> and no characters that
needed escaping were present in the string.
</para>
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 13, Lines Added: 22, Lines Deleted: 22; 6333 bytes
@@ -11320,7 +11320,7 @@
<message>
<para>
- Setting <literal>server_id</literal> did not update its value
+ Setting <literal role="sysvar">server_id</literal> did not update its value
for the current session.
</para>
@@ -11503,7 +11503,7 @@
<message>
<para>
- Introduced the <literal>slave_exec_mode</literal> system
+ Introduced the <literal role="sysvar">slave_exec_mode</literal> system
variable to control whether idempotent or strict mode is used
for replication conflict resolution. Idempotent mode suppresses
duplicate-key, no-key-found, and some other errors, and is
@@ -16547,7 +16547,7 @@
<message>
<para>
- With the <literal>read_only</literal> system variable enabled,
+ With the <literal role="sysvar">read_only</literal> system variable enabled,
<literal role="stmt">CREATE DATABASE</literal> and
<literal role="stmt">DROP DATABASE</literal> were allowed to
users who did not have the <literal role="priv">SUPER</literal>
@@ -19383,12 +19383,12 @@
<para>
Tables in the <literal>mysql</literal> database that stored the
- current <literal>sql_mode</literal> value as part of stored
+ current <literal role="sysvar">sql_mode</literal> value as part of stored
program definitions were not updated with newer mode values
(<literal>NO_ENGINE_SUBSTITUTION</literal>,
<literal>PAD_CHAR_TO_FULL_LENGTH</literal>). This causes various
problems defining stored programs if those modes were included
- in the current <literal>sql_mode</literal> value.
+ in the current <literal role="sysvar">sql_mode</literal> value.
</para>
</message>
@@ -19397,11 +19397,11 @@
<para>
An issue with the <literal>NO_ENGINE_SUBSTITUTION</literal>
- <literal>sql_mode</literal> database can cause the creation of
+ <literal role="sysvar">sql_mode</literal> database can cause the creation of
stored routines to fail. If you are having problems with
creating stored routines while using this
- <literal>sql_mode</literal> value, remove this value from your
- <literal>sql_mode</literal> setting.
+ <literal role="sysvar">sql_mode</literal> value, remove this value from your
+ <literal role="sysvar">sql_mode</literal> setting.
</para>
</message>
@@ -19410,11 +19410,11 @@
<para>
An issue with the <literal>NO_ENGINE_SUBSTITUTION</literal>
- <literal>sql_mode</literal> database can cause the creation of
+ <literal role="sysvar">sql_mode</literal> database can cause the creation of
stored routines to fail. If you are having problems with
creating stored routines while using this
- <literal>sql_mode</literal> value, remove this value from your
- <literal>sql_mode</literal> setting.
+ <literal role="sysvar">sql_mode</literal> value, remove this value from your
+ <literal role="sysvar">sql_mode</literal> setting.
</para>
</message>
@@ -20825,7 +20825,7 @@
<message>
<para>
- A variable named <literal>read_only</literal> could be declared
+ A variable named <literal role="sysvar">read_only</literal> could be declared
even though that is a reserved word.
</para>
@@ -23578,10 +23578,10 @@
<para>
The new read-only global system variables
- <literal>report_host</literal>,
- <literal>report_password</literal>,
- <literal>report_port</literal>, and
- <literal>report_user</literal> system variables provide runtime
+ <literal role="sysvar">report_host</literal>,
+ <literal role="sysvar">report_password</literal>,
+ <literal role="sysvar">report_port</literal>, and
+ <literal role="sysvar">report_user</literal> system variables provide runtime
access to the values of the corresponding
<option>--report-host</option>,
<option>--report-password</option>,
@@ -23753,7 +23753,7 @@
<para>
Assignment of relative pathnames to
<literal role="sysvar">general_log_file</literal> or
- <literal>slow_query_log_file</literal> did not always work.
+ <literal role="sysvar">slow_query_log_file</literal> did not always work.
</para>
</message>
@@ -25469,7 +25469,7 @@
<message>
<para>
- Enabling the <literal>read_only</literal> system variable while
+ Enabling the <literal role="sysvar">read_only</literal> system variable while
autocommit mode was enabled caused
<literal role="stmt">SELECT</literal> statements for
transactional storage engines to fail.
@@ -27692,7 +27692,7 @@
Index scans performed with the <literal>sort_union()</literal>
access method returned wrong results, caused memory to be
leaked, and caused temporary files to be deleted when the limit
- set by <literal>sort_buffer_size</literal> was reached.
+ set by <literal role="sysvar">sort_buffer_size</literal> was reached.
</para>
</message>
@@ -31444,7 +31444,7 @@
<message>
<para>
- The <literal>secure_file_priv</literal> system variable now
+ The <literal role="sysvar">secure_file_priv</literal> system variable now
applies to <literal role="stmt">BACKUP DATABASE</literal> and
<literal role="stmt">RESTORE</literal> operations: If the value
is nonempty, backup and restore operations can read and write
@@ -32791,8 +32791,8 @@
variable. You should use the <option>--slow_query_log</option>
and
<option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
- options instead (and the <literal>slow_query_log</literal> and
- <literal>slow_query_log_file</literal> system variables).
+ options instead (and the <literal role="sysvar">slow_query_log</literal> and
+ <literal role="sysvar">slow_query_log_file</literal> system variables).
</para>
</message>
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 43, Lines Added: 56, Lines Deleted: 56; 19346 bytes
@@ -4427,7 +4427,7 @@
<listitem>
<para>
Relay logs were rotated every
- <literal>slave_net_timeout</literal> seconds even if no
+ <literal role="sysvar">slave_net_timeout</literal> seconds even if no
statements were being replicated.
</para>
</listitem>
@@ -4445,7 +4445,7 @@
<listitem>
<para>
Replication master-slave connections used
- <literal>slave_net_timeout</literal> for connection
+ <literal role="sysvar">slave_net_timeout</literal> for connection
timeouts.
</para>
</listitem>
@@ -9217,7 +9217,7 @@
<para>
<literal>UNION</literal> statements did not consult
- <literal>sql_select_limit</literal> value when set. This is now
+ <literal role="sysvar">sql_select_limit</literal> value when set. This is now
fixed properly, which means that this limit is applied to the
top level query, unless <literal>LIMIT</literal> for entire
<literal>UNION</literal> is used.
@@ -10731,13 +10731,13 @@
<para>
New binary log format that enables replication of these session
- variables: <literal>sql_mode</literal>,
+ variables: <literal role="sysvar">sql_mode</literal>,
<literal role="sysvar">sql_auto_is_null</literal>,
<literal role="sysvar">foreign_key_checks</literal> (which was
replicated since 4.0.14, but here it's done more efficiently and
takes less space in the binary logs),
<literal role="sysvar">unique_checks</literal>. Other variables
- (like character sets, <literal>sql_select_limit</literal>, ...)
+ (like character sets, <literal role="sysvar">sql_select_limit</literal>, ...)
will be replicated in upcoming 5.0.x releases.
</para>
@@ -17545,7 +17545,7 @@
<para>
Added a new global system variable
- <literal>slave_transaction_retries</literal>: If the replication
+ <literal role="sysvar">slave_transaction_retries</literal>: If the replication
slave SQL thread fails to execute a transaction because of an
<literal>InnoDB</literal> deadlock or exceeded
<literal>InnoDB</literal>'s
@@ -17553,7 +17553,7 @@
<literal>NDBCLUSTER</literal>'s
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal>, it automatically
- retries <literal>slave_transaction_retries</literal> times
+ retries <literal role="sysvar">slave_transaction_retries</literal> times
before stopping with an error. The default is 0, and you must
explicitly set the value greater than 0 to enable the
<quote>retry</quote> behavior.
@@ -17565,7 +17565,7 @@
<para>
Added a new global system variable
- <literal>slave_transaction_retries</literal>: If the replication
+ <literal role="sysvar">slave_transaction_retries</literal>: If the replication
slave SQL thread fails to execute a transaction because of an
<literal>InnoDB</literal> deadlock or exceeded
<literal>InnoDB</literal>'s
@@ -17573,7 +17573,7 @@
<literal>NDBCLUSTER</literal>'s
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal>, it automatically
- retries <literal>slave_transaction_retries</literal> times
+ retries <literal role="sysvar">slave_transaction_retries</literal> times
before stopping with an error. The default is 10.
</para>
@@ -21151,7 +21151,7 @@
<message>
<para>
- New global system variable <literal>relay_log_purge</literal> to
+ New global system variable <literal role="sysvar">relay_log_purge</literal> to
enable or disable automatic relay log purging.
</para>
@@ -24488,10 +24488,10 @@
The general query log and slow query logs now can be enabled or
disabled at runtime with the
<literal role="sysvar">general_log</literal> and
- <literal>slow_query_log</literal> system variables, and the name
+ <literal role="sysvar">slow_query_log</literal> system variables, and the name
of the log files can be changed by setting the
<literal role="sysvar">general_log_file</literal> and
- <literal>slow_query_log_file</literal> system variables. See
+ <literal role="sysvar">slow_query_log_file</literal> system variables. See
<xref linkend="query-log"/>, and
<xref linkend="slow-query-log"/>.
</para>
@@ -24541,7 +24541,7 @@
<message>
<para>
- If you attempt to enable <literal>read_only</literal> while you
+ If you attempt to enable <literal role="sysvar">read_only</literal> while you
have any explicit locks (acquired with <literal role="stmt">LOCK
TABLES</literal> or have a pending transaction, an error will
occur.
@@ -24890,7 +24890,7 @@
<message>
<para>
- New <literal>sql_mode</literal> mode
+ New <literal role="sysvar">sql_mode</literal> mode
<literal>NO_ENGINE_SUBSTITUTION</literal> prevents automatic
substitution of storage engine when the requested storage engine
is disabled or not compiled in.
@@ -31674,7 +31674,7 @@
<para>
Evaluation of subqueries that require the filesort algorithm
were allocating and freeing the
- <literal>sort_buffer_size</literal> buffer many times, resulting
+ <literal role="sysvar">sort_buffer_size</literal> buffer many times, resulting
in slow performance. Now the buffer is allocated once and
reused.
</para>
@@ -34738,11 +34738,11 @@
<para>
If other clients hold explicit table locks or have pending
- transactions, the attempt to enable <literal>read_only</literal>
+ transactions, the attempt to enable <literal role="sysvar">read_only</literal>
blocks until the locks are released and the transactions end.
- While the attempt to enable <literal>read_only</literal> is
+ While the attempt to enable <literal role="sysvar">read_only</literal> is
pending, requests by other clients for table locks or to begin
- transactions also block until <literal>read_only</literal> has
+ transactions also block until <literal role="sysvar">read_only</literal> has
been set.
</para>
@@ -36452,7 +36452,7 @@
<para>
The compilation flag <literal>DONT_USE_DEFAULT_FIELDS</literal>
was removed because you can get the same behavior by setting the
- <literal>sql_mode</literal> system variable to
+ <literal role="sysvar">sql_mode</literal> system variable to
<literal>STRICT_TRANS_TABLES</literal>.
</para>
@@ -46776,7 +46776,7 @@
<message>
<para>
- Made the <literal>relay_log_space_limit</literal> system
+ Made the <literal role="sysvar">relay_log_space_limit</literal> system
variable show up in the output of <literal role="stmt">SHOW
VARIABLES</literal>.
</para>
@@ -50480,7 +50480,7 @@
<message>
<para>
- Added <literal>secure_auth</literal> global server system
+ Added <literal role="sysvar">secure_auth</literal> global server system
variable and <option>--secure-auth</option> server option that
disallow authentication for accounts that have old (pre-4.1.1)
passwords.
@@ -57517,7 +57517,7 @@
<para>
The definition of the enumeration-valued
- <literal>sql_mode</literal> column of the
+ <literal role="sysvar">sql_mode</literal> column of the
<literal>mysql.proc</literal> table was missing some of the
current allowable SQL modes, so stored routines would not
necessarily execute with the SQL mode in effect at the time of
@@ -58513,9 +58513,9 @@
<message>
<para>
- Added the <literal>ssl_ca</literal>,
- <literal>ssl_capath</literal>, <literal>ssl_cert</literal>,
- <literal>ssl_cipher</literal>, and <literal>ssl_key</literal>
+ Added the <literal role="sysvar">ssl_ca</literal>,
+ <literal role="sysvar">ssl_capath</literal>, <literal role="sysvar">ssl_cert</literal>,
+ <literal role="sysvar">ssl_cipher</literal>, and <literal role="sysvar">ssl_key</literal>
system variables, which display the values given via the
corresponding command options. See
<xref linkend="ssl-options"/>.
@@ -66240,8 +66240,8 @@
<para>
A trigger dependent on a feature of one
- <literal>sql_mode</literal> setting would cause an error when
- invoked after the <literal>sql_mode</literal> was changed.
+ <literal role="sysvar">sql_mode</literal> setting would cause an error when
+ invoked after the <literal role="sysvar">sql_mode</literal> was changed.
</para>
</message>
@@ -70606,7 +70606,7 @@
<message>
<para>
- Setting the <literal>slow_query_log_file</literal> system
+ Setting the <literal role="sysvar">slow_query_log_file</literal> system
variable caused log output to go tothe general log, not the slow
query log.
</para>
@@ -79802,7 +79802,7 @@
<para>
<command>mysqldump</command> produced output that incorrectly
discarded the <literal>NO_AUTO_VALUE_ON_ZERO</literal> value of
- the <literal>sql_mode</literal> variable after dumping triggers.
+ the <literal role="sysvar">sql_mode</literal> variable after dumping triggers.
</para>
</message>
@@ -92432,7 +92432,7 @@
<message>
<para>
- The <literal>sql_mode</literal>,
+ The <literal role="sysvar">sql_mode</literal>,
<literal role="sysvar">foreign_key_checks</literal>,
<literal role="sysvar">unique_checks</literal>, character
set/collations, and
@@ -94618,8 +94618,8 @@
<para>
<literal role="stmt">SHOW VARIABLES</literal> now shows the
<literal role="sysvar">slave_compressed_protocol</literal>,
- <literal>slave_load_tmpdir</literal> and
- <literal>slave_skip_errors</literal> system variables.
+ <literal role="sysvar">slave_load_tmpdir</literal> and
+ <literal role="sysvar">slave_skip_errors</literal> system variables.
</para>
</message>
@@ -97549,7 +97549,7 @@
<message>
<para>
- The <literal>read_only</literal> system variable no longer
+ The <literal role="sysvar">read_only</literal> system variable no longer
applies to <literal>TEMPORARY</literal> tables.
</para>
@@ -104642,7 +104642,7 @@
<para>
With settings of
<literal role="sysvar">read_buffer_size</literal> >= 2G and
- <literal>read_rnd_buffer_size</literal> >=2G,
+ <literal role="sysvar">read_rnd_buffer_size</literal> >=2G,
<literal role="stmt" condition="load-data">LOAD DATA
INFILE</literal> failed with no error message or caused a server
crash for files larger than 2GB.
@@ -110303,7 +110303,7 @@
<message>
<para>
- <literal>read_only</literal> can be enabled while you hold a
+ <literal role="sysvar">read_only</literal> can be enabled while you hold a
global read lock (acquired with
<literal role="stmt" condition="flush">FLUSH TABLES WITH READ
LOCK</literal>) because that does not involve table locks.
@@ -110589,14 +110589,14 @@
<para>
The following conditions apply to enabling the
- <literal>read_only</literal> system variable:
+ <literal role="sysvar">read_only</literal> system variable:
</para>
<itemizedlist>
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal> while
+ If you attempt to enable <literal role="sysvar">read_only</literal> while
you have any explicit locks (acquired with
<literal role="stmt">LOCK TABLES</literal> or have a pending
transaction, an error will occur.
@@ -110607,17 +110607,17 @@
<para>
If other clients hold explicit table locks or have pending
transactions, the attempt to enable
- <literal>read_only</literal> blocks until the locks are
+ <literal role="sysvar">read_only</literal> blocks until the locks are
released and the transactions end. While the attempt to
- enable <literal>read_only</literal> is pending, requests by
+ enable <literal role="sysvar">read_only</literal> is pending, requests by
other clients for table locks or to begin transactions also
- block until <literal>read_only</literal> has been set.
+ block until <literal role="sysvar">read_only</literal> has been set.
</para>
</listitem>
<listitem>
<para>
- <literal>read_only</literal> can be enabled while you hold a
+ <literal role="sysvar">read_only</literal> can be enabled while you hold a
global read lock (acquired with
<literal role="stmt" condition="flush">FLUSH TABLES WITH
READ LOCK</literal>) because that does not involve table
@@ -110640,7 +110640,7 @@
</itemizedlist>
<para>
- Previously, the attempt to enable <literal>read_only</literal>
+ Previously, the attempt to enable <literal role="sysvar">read_only</literal>
would return immediately even if explicit locks or transactions
were pending, so some data changes could occur for statements
executing in the server at the same time.
@@ -112501,7 +112501,7 @@
<message>
<para>
- Now <literal>sql_select_limit</literal> variable has no
+ Now <literal role="sysvar">sql_select_limit</literal> variable has no
influence on subqueries.
</para>
@@ -113605,10 +113605,10 @@
<para>
When dumping procedures, <command>mysqldump
<option>--compact</option> </command> generated output that
- restored the session variable <literal>sql_mode</literal>
+ restored the session variable <literal role="sysvar">sql_mode</literal>
without first capturing it. When dumping routines,
<command>mysqldump <option>--compact</option> </command> neither
- set nor retrieved the value of <literal>sql_mode</literal>.
+ set nor retrieved the value of <literal role="sysvar">sql_mode</literal>.
</para>
</message>
@@ -114163,7 +114163,7 @@
declarations is used. Parameters, variables, and return values
must be scalars; it is no longer possible to assign a row value.
Also, stored functions execute using the
- <literal>sql_mode</literal> value in force at function creation
+ <literal role="sysvar">sql_mode</literal> value in force at function creation
time rather than ignoring it. For more information, see
<xref linkend="create-procedure"/>.
</para>
@@ -127237,7 +127237,7 @@
<para>
The values of the
<literal role="sysvar">max_sort_length</literal>,
- <literal>sql_mode</literal>, and
+ <literal role="sysvar">sql_mode</literal>, and
<literal role="sysvar">group_concat_max_len</literal> system
variables now are stored in the query cache with other query
information to avoid returning an incorrect result from the
@@ -129346,7 +129346,7 @@
<para>
For a nonexistent table, <literal>DROP TEMPORARY TABLE</literal>
failed with an incorrect error message if
- <literal>read_only</literal> was enabled.
+ <literal role="sysvar">read_only</literal> was enabled.
</para>
</message>
@@ -134373,7 +134373,7 @@
<para>
When using <literal>SET sql_mode='mode'</literal> for a complex
mode (such as <literal>ANSI</literal>), we now update the
- <literal>sql_mode</literal> variable to include all the
+ <literal role="sysvar">sql_mode</literal> variable to include all the
individual options implied by the complex mode.
</para>
@@ -136006,7 +136006,7 @@
<message>
<para>
- Changes to the <literal>sql_mode</literal> system variable were
+ Changes to the <literal role="sysvar">sql_mode</literal> system variable were
not tracked by <literal>INSERT DELAYED</literal>.
</para>
@@ -137041,7 +137041,7 @@
<listitem>
<para>
For <literal role="sysvar">join_buffer_size</literal>,
- <literal>sort_buffer_size</literal>, and
+ <literal role="sysvar">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.
@@ -137053,7 +137053,7 @@
<para>
In addition, settings for
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are limited to 2GB on
+ <literal role="sysvar">read_rnd_buffer_size</literal> are limited to 2GB on
all platforms. Larger values are truncated to 2GB with a
warning.
</para>
@@ -137090,7 +137090,7 @@
<listitem>
<para>
For <literal role="sysvar">join_buffer_size</literal>,
- <literal>sort_buffer_size</literal>, and
+ <literal role="sysvar">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
@@ -137103,7 +137103,7 @@
<para>
In addition, settings for
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are limited to 2GB on
+ <literal role="sysvar">read_rnd_buffer_size</literal> are limited to 2GB on
all platforms. Larger values are truncated to 2GB with a
warning.
</para>
@@ -139928,7 +139928,7 @@
<literal>Unknown system variable</literal> message. Now these
variables are treated as synonyms for
<literal role="sysvar">general_log</literal> and
- <literal>slow_query_log</literal>, which means that they can be
+ <literal role="sysvar">slow_query_log</literal>, which means that they can be
accessed in expressions and their values can be changed with
<literal>SET</literal>.
</para>
@@ -139948,7 +139948,7 @@
<literal>Unknown system variable</literal> message. Now these
variables are treated as synonyms for
<literal role="sysvar">general_log</literal> and
- <literal>slow_query_log</literal>, which means that they can be
+ <literal role="sysvar">slow_query_log</literal>, which means that they can be
accessed in expressions and their values can be changed with
<literal>SET</literal>.
</para>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 21, Lines Added: 21, Lines Deleted: 21; 4636 bytes
@@ -4913,7 +4913,7 @@
<mysqloption section="replication" id="slave_exec_mode">
- <xrefto id="option_mysqld_slave_exec_mode"/>
+ <xrefto id="sysvar_slave_exec_mode"/>
<name>slave_exec_mode</name>
@@ -15840,7 +15840,7 @@
<mysqloption section="server" id="read_only">
- <xrefto id="option_mysqld_read_only"/>
+ <xrefto id="sysvar_read_only"/>
<name>read_only</name>
@@ -15869,7 +15869,7 @@
<mysqloption section="server" id="read_rnd_buffer_size">
- <xrefto id="option_mysqld_read_rnd_buffer_size"/>
+ <xrefto id="sysvar_read_rnd_buffer_size"/>
<name>read_rnd_buffer_size</name>
@@ -16006,7 +16006,7 @@
<mysqloption section="replication" id="relay_log_purge">
- <xrefto id="option_mysqld_relay_log_purge"/>
+ <xrefto id="sysvar_relay_log_purge"/>
<name>relay_log_purge</name>
@@ -16036,7 +16036,7 @@
<mysqloption section="server" id="relay_log_space_limit">
- <xrefto id="option_mysqld_relay_log_space_limit"/>
+ <xrefto id="sysvar_relay_log_space_limit"/>
<name>relay_log_space_limit</name>
@@ -16743,7 +16743,7 @@
<mysqloption section="server" id="server-id">
- <xrefto id="option_mysqld_server-id"/>
+ <xrefto id="sysvar_server_id"/>
<name>server-id</name>
@@ -16908,7 +16908,7 @@
<mysqloption section="server" id="skip-external-locking">
- <xrefto id="option_mysqld_skip-external-locking"/>
+ <xrefto id="sysvar_skip_external_locking"/>
<name>skip-external-locking</name>
@@ -17535,7 +17535,7 @@
<mysqloption section="replication" id="slave_transaction_retries">
- <xrefto id="option_mysqld_slave_transaction_retries"/>
+ <xrefto id="sysvar_slave_transaction_retries"/>
<name>slave_transaction_retries</name>
@@ -17597,7 +17597,7 @@
<mysqloption section="server" id="slow_query_log_file">
- <xrefto id="option_mysqld_slow_query_log_file"/>
+ <xrefto id="sysvar_slow_query_log_file"/>
<name>slow_query_log_file</name>
@@ -17623,7 +17623,7 @@
<mysqloption section="server" id="slow_launch_time">
- <xrefto id="option_mysqld_slow_launch_time"/>
+ <xrefto id="sysvar_slow_launch_time"/>
<name>slow_launch_time</name>
@@ -17696,7 +17696,7 @@
<mysqloption section="server" id="sort_buffer_size">
- <xrefto id="option_mysqld_sort_buffer_size"/>
+ <xrefto id="sysvar_sort_buffer_size"/>
<name>sort_buffer_size</name>
@@ -18166,7 +18166,7 @@
<mysqloption section="server" id="sql_select_limit">
- <xrefto id="option_mysqld_sql_select_limit"/>
+ <xrefto id="sysvar_sql_select_limit"/>
<name>sql_select_limit</name>
@@ -18191,7 +18191,7 @@
<mysqloption section="replication" id="sql_slave_skip_counter">
- <xrefto id="option_mysqld_sql_slave_skip_counter"/>
+ <xrefto id="sysvar_sql_slave_skip_counter"/>
<name>sql_slave_skip_counter</name>
@@ -18275,7 +18275,7 @@
<mysqloption section="ssl" id="ssl-ca">
- <xrefto id="option_mysqld_ssl-ca"/>
+ <xrefto id="sysvar_ssl_ca"/>
<name>ssl-ca</name>
@@ -18305,7 +18305,7 @@
<mysqloption section="ssl" id="ssl-capath">
- <xrefto id="option_mysqld_ssl-capath"/>
+ <xrefto id="sysvar_ssl_capath"/>
<name>ssl-capath</name>
@@ -18335,7 +18335,7 @@
<mysqloption section="ssl" id="ssl-cert">
- <xrefto id="option_mysqld_ssl-cert"/>
+ <xrefto id="sysvar_ssl_cert"/>
<name>ssl-cert</name>
@@ -18365,7 +18365,7 @@
<mysqloption section="ssl" id="ssl-cipher">
- <xrefto id="option_mysqld_ssl-cipher"/>
+ <xrefto id="sysvar_ssl_cipher"/>
<name>ssl-cipher</name>
@@ -18395,7 +18395,7 @@
<mysqloption section="ssl" id="ssl-key">
- <xrefto id="option_mysqld_ssl-key"/>
+ <xrefto id="sysvar_ssl_key"/>
<name>ssl-key</name>
@@ -18425,7 +18425,7 @@
<mysqloption section="ssl" id="ssl-verify-server-cert">
- <xrefto id="option_mysqld_ssl-verify-server-cert"/>
+ <xrefto id="option_mysqld_ssl_verify-server-cert"/>
<name>ssl-verify-server-cert</name>
@@ -20652,7 +20652,7 @@
<mysqloption section="server" id="shared_memory">
- <xrefto id="option_mysqld_shared_memory"/>
+ <xrefto id="sysvar_shared_memory"/>
<name>shared_memory</name>
@@ -20678,7 +20678,7 @@
<mysqloption section="server" id="shared_memory_base_name">
- <xrefto id="option_mysqld_shared_memory_base_name"/>
+ <xrefto id="sysvar_shared_memory_base_name"/>
<name>shared-memory-base-name</name>
Modified: trunk/mysql-monitor/data-items.xml
===================================================================
--- trunk/mysql-monitor/data-items.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/mysql-monitor/data-items.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 11, Lines Added: 15, Lines Deleted: 15; 6992 bytes
@@ -3704,14 +3704,14 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_read_only">mysql:server:read_only</link></entry>
+ <entry><link linkend="sysvar_read_only">mysql:server:read_only</link></entry>
<entry>Make all non-temporary tables read-only</entry>
<entry>General.Features</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_read_rnd_buffer_size">mysql:server:read_rnd_buffer_size</link></entry>
+ <entry><link linkend="sysvar_read_rnd_buffer_size">mysql:server:read_rnd_buffer_size</link></entry>
<entry>When reading rows in sorted order after a sort, the rows are read
through this buffer to avoid a disk seeks. If not set,
then it's set to the value of record_buffer</entry>
@@ -3736,7 +3736,7 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_relay_log_purge">mysql:server:relay_log_purge</link></entry>
+ <entry><link linkend="sysvar_relay_log_purge">mysql:server:relay_log_purge</link></entry>
<entry>Determines whether relay logs are purged</entry>
<entry>General.Miscellaneous</entry>
<entry>VARCHAR</entry>
@@ -3908,7 +3908,7 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_server-id">mysql:server:server_id</link></entry>
+ <entry><link linkend="sysvar_server_id">mysql:server:server_id</link></entry>
<entry>Uniquely identifies the server instance in the community of replication
partners</entry>
<entry>General.Overview</entry>
@@ -3916,14 +3916,14 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_shared_memory">mysql:server:shared_memory</link></entry>
+ <entry><link linkend="sysvar_shared_memory">mysql:server:shared_memory</link></entry>
<entry>Whether the server allows shared-memory connections</entry>
<entry>General.Features</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_shared_memory_base_name">mysql:server:shared_memory_base_name</link></entry>
+ <entry><link linkend="sysvar_shared_memory_base_name">mysql:server:shared_memory_base_name</link></entry>
<entry>The name of shared memory to use for shared-memory connections</entry>
<entry>General.Features</entry>
<entry>VARCHAR</entry>
@@ -3937,7 +3937,7 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_skip-external-locking">mysql:server:skip_external_locking</link></entry>
+ <entry><link linkend="sysvar_skip_external_locking">mysql:server:skip_external_locking</link></entry>
<entry>Skip system (external) locking</entry>
<entry>SQL.Overview</entry>
<entry>VARCHAR</entry>
@@ -4035,7 +4035,7 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_slave_transaction_retries">mysql:server:slave_transaction_retries</link></entry>
+ <entry><link linkend="sysvar_slave_transaction_retries">mysql:server:slave_transaction_retries</link></entry>
<entry>Number of times the slave SQL thread will retry a transaction in case it
failed with a deadlock or elapsed lock wait timeout,
before giving up and stopping</entry>
@@ -4052,7 +4052,7 @@
<entry>1</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_slow_launch_time">mysql:server:slow_launch_time</link></entry>
+ <entry><link linkend="sysvar_slow_launch_time">mysql:server:slow_launch_time</link></entry>
<entry>If creating the thread takes longer than this value (in seconds), the
Slow_launch_threads counter will be incremented</entry>
<entry>General.Performance</entry>
@@ -4074,7 +4074,7 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_sort_buffer_size">mysql:server:sort_buffer_size</link></entry>
+ <entry><link linkend="sysvar_sort_buffer_size">mysql:server:sort_buffer_size</link></entry>
<entry>Each thread that needs to do a sort allocates a buffer of this size</entry>
<entry>Memory.Buffers</entry>
<entry>INTEGER</entry>
@@ -4153,7 +4153,7 @@
<entry>1</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_ssl-ca">mysql:server:ssl_ca</link></entry>
+ <entry><link linkend="sysvar_ssl_ca">mysql:server:ssl_ca</link></entry>
<entry>CA file in PEM format (check OpenSSL docs, implies --ssl)</entry>
<entry>SSL.Setup</entry>
<entry>VARCHAR</entry>
@@ -4167,21 +4167,21 @@
<entry>1</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_ssl-capath">mysql:server:ssl_capath</link></entry>
+ <entry><link linkend="sysvar_ssl_capath">mysql:server:ssl_capath</link></entry>
<entry>CA directory (check OpenSSL docs, implies --ssl)</entry>
<entry>SSL.Setup</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_ssl-cert">mysql:server:ssl_cert</link></entry>
+ <entry><link linkend="sysvar_ssl_cert">mysql:server:ssl_cert</link></entry>
<entry>X509 certification in PEM format (implies --ssl)</entry>
<entry>SSL.Setup</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_ssl-cipher">mysql:server:ssl_cipher</link></entry>
+ <entry><link linkend="sysvar_ssl_cipher">mysql:server:ssl_cipher</link></entry>
<entry>SSL cipher to use (implies --ssl)</entry>
<entry>SSL.Setup</entry>
<entry>VARCHAR</entry>
@@ -4244,7 +4244,7 @@
<entry>1</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_ssl-key">mysql:server:ssl_key</link></entry>
+ <entry><link linkend="sysvar_ssl_key">mysql:server:ssl_key</link></entry>
<entry>X509 key in PEM format (implies ––ssl)</entry>
<entry>SSL.Setup</entry>
<entry>VARCHAR</entry>
Modified: trunk/refman-4.1/backup.xml
===================================================================
--- trunk/refman-4.1/backup.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/backup.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 691 bytes
@@ -1946,7 +1946,7 @@
<note>
<para>
If you want a repair operation to go much faster, you should
- set the values of the <literal>sort_buffer_size</literal> and
+ set the values of the <literal role="sysvar">sort_buffer_size</literal> and
<literal role="sysvar">key_buffer_size</literal> variables
each to about 25% of your available memory when running
<command>myisamchk</command>.
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/data-types.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes
@@ -4114,7 +4114,7 @@
To enable <literal>MAXDB</literal> mode, set the server SQL
mode to <literal>MAXDB</literal> at startup using the
<option>--sql-mode=MAXDB</option> server option or by setting
- the global <literal>sql_mode</literal> variable at runtime:
+ the global <literal role="sysvar">sql_mode</literal> variable at runtime:
</para>
<programlisting>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/dba-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 39, Lines Added: 44, Lines Deleted: 44; 13679 bytes
@@ -1952,7 +1952,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-external-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -2887,7 +2887,7 @@
was started with <option>--ansi</option>. See
<xref linkend="ansi-mode"/>. This variable was added in
MySQL 3.23.6 and removed in 3.23.41. See the description for
- <literal>sql_mode</literal>.
+ <literal role="sysvar">sql_mode</literal>.
</para>
</listitem>
@@ -6011,7 +6011,7 @@
writing to the client,
<literal role="sysvar">net_write_timeout</literal> is the
timeout value controlling when to abort. See also
- <literal>slave_net_timeout</literal>. This variable was
+ <literal role="sysvar">slave_net_timeout</literal>. This variable was
added in MySQL 3.23.20.
</para>
</listitem>
@@ -6530,7 +6530,7 @@
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
@@ -6542,7 +6542,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_read_only">
+ <para id="sysvar_read_only">
<indexterm>
<primary>read_only system variable</primary>
</indexterm>
@@ -6552,7 +6552,7 @@
<secondary>read_only</secondary>
</indexterm>
- <literal>read_only</literal>
+ <literal role="sysvar">read_only</literal>
</para>
<para>
@@ -6566,10 +6566,10 @@
</para>
<para>
- <literal>read_only</literal> exists only as a
+ <literal role="sysvar">read_only</literal> exists only as a
<literal>GLOBAL</literal> variable, so changes to its value
require the <literal role="priv">SUPER</literal> privilege.
- Changes to <literal>read_only</literal> on a master server
+ Changes to <literal role="sysvar">read_only</literal> on a master server
are not replicated to slave servers. The value can be set on
a slave server independent of the setting on the master.
</para>
@@ -6580,7 +6580,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_read_rnd_buffer_size">
+ <para id="sysvar_read_rnd_buffer_size">
<indexterm>
<primary>read_rnd_buffer_size system variable</primary>
</indexterm>
@@ -6590,7 +6590,7 @@
<secondary>read_rnd_buffer_size</secondary>
</indexterm>
- <literal>read_rnd_buffer_size</literal>
+ <literal role="sysvar">read_rnd_buffer_size</literal>
</para>
<para>
@@ -6607,7 +6607,7 @@
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
@@ -6637,7 +6637,7 @@
table privileges. This can improve security if you are
concerned about people being able to see what databases
other users have. See also
- <literal>skip_show_database</literal>.
+ <literal role="sysvar">skip_show_database</literal>.
</para>
<para>
@@ -6649,7 +6649,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_auth">
+ <para id="sysvar_secure_auth">
<indexterm>
<primary>secure_auth system variable</primary>
</indexterm>
@@ -6659,7 +6659,7 @@
<secondary>secure_auth</secondary>
</indexterm>
- <literal>secure_auth</literal>
+ <literal role="sysvar">secure_auth</literal>
</para>
<para>
@@ -6685,7 +6685,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory">
+ <para id="sysvar_shared_memory">
<indexterm>
<primary>shared_memory system variable</primary>
</indexterm>
@@ -6695,7 +6695,7 @@
<secondary>shared_memory</secondary>
</indexterm>
- <literal>shared_memory</literal>
+ <literal role="sysvar">shared_memory</literal>
</para>
<para>
@@ -6705,7 +6705,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory_base_name">
+ <para id="sysvar_shared_memory_base_name">
<indexterm>
<primary>shared_memory_base_name system variable</primary>
</indexterm>
@@ -6715,7 +6715,7 @@
<secondary>shared_memory_base_name</secondary>
</indexterm>
- <literal>shared_memory_base_name</literal>
+ <literal role="sysvar">shared_memory_base_name</literal>
</para>
<para>
@@ -6727,7 +6727,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-exernal-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -6746,7 +6746,7 @@
<secondary>skip_external_locking</secondary>
</indexterm>
- <literal>skip_external_locking</literal>
+ <literal role="sysvar">skip_external_locking</literal>
</para>
<para>
@@ -6768,7 +6768,7 @@
<secondary>skip_networking</secondary>
</indexterm>
- <literal>skip_networking</literal>
+ <literal role="sysvar">skip_networking</literal>
</para>
<para>
@@ -6785,7 +6785,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip_show_database">
+ <para id="sysvar_skip_show_database">
<indexterm>
<primary>skip_show_database system variable</primary>
</indexterm>
@@ -6795,7 +6795,7 @@
<secondary>skip_show_database</secondary>
</indexterm>
- <literal>skip_show_database</literal>
+ <literal role="sysvar">skip_show_database</literal>
</para>
<para>
@@ -6823,7 +6823,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_launch_time">
+ <para id="sysvar_slow_launch_time">
<indexterm>
<primary>slow_launch_time system variable</primary>
</indexterm>
@@ -6833,7 +6833,7 @@
<secondary>slow_launch_time</secondary>
</indexterm>
- <literal>slow_launch_time</literal>
+ <literal role="sysvar">slow_launch_time</literal>
</para>
<para>
@@ -6855,7 +6855,7 @@
<secondary>socket</secondary>
</indexterm>
- <literal>socket</literal>
+ <literal role="sysvar">socket</literal>
</para>
<para>
@@ -6874,7 +6874,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sort_buffer_size">
+ <para id="sysvar_sort_buffer_size">
<indexterm>
<primary>sort_buffer_size system variable</primary>
</indexterm>
@@ -6884,7 +6884,7 @@
<secondary>sort_buffer_size</secondary>
</indexterm>
- <literal>sort_buffer_size</literal>
+ <literal role="sysvar">sort_buffer_size</literal>
</para>
<para>
@@ -6896,7 +6896,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_mode">
+ <para id="sysvar_sql_mode">
<indexterm>
<primary>sql_mode system variable</primary>
</indexterm>
@@ -6906,7 +6906,7 @@
<secondary>sql_mode</secondary>
</indexterm>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para>
@@ -6917,7 +6917,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_select_limit">
+ <para id="sysvar_sql_select_limit">
<indexterm>
<primary>sql_select_limit system variable</primary>
</indexterm>
@@ -6927,7 +6927,7 @@
<secondary>sql_select_limit</secondary>
</indexterm>
- <literal>sql_select_limit</literal>
+ <literal role="sysvar">sql_select_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:sql_select_limit"/>
@@ -6950,11 +6950,11 @@
If a <literal role="stmt">SELECT</literal> has a
<literal>LIMIT</literal> clause, the
<literal>LIMIT</literal> takes precedence over the value of
- <literal>sql_select_limit</literal>.
+ <literal role="sysvar">sql_select_limit</literal>.
</para>
<para>
- <literal>sql_select_limit</literal> does not apply to
+ <literal role="sysvar">sql_select_limit</literal> does not apply to
<literal role="stmt">SELECT</literal> statements executed
within stored routines. It also does not apply to
<literal role="stmt">SELECT</literal> statements that do not
@@ -7339,7 +7339,7 @@
directory are lost when the server restarts, replication
fails. However, if you are using MySQL 4.0.0 or later, you
can set the slave's temporary directory using the
- <literal>slave_load_tmpdir</literal> variable. In that case,
+ <literal role="sysvar">slave_load_tmpdir</literal> variable. In that case,
the slave won't use the general <literal>tmpdir</literal>
value and you can set <literal>tmpdir</literal> to a
non-permanent location.
@@ -8336,9 +8336,9 @@
are initialized at connect time using the current values of
the corresponding global variables. For example, the
client's SQL mode is controlled by the session
- <literal>sql_mode</literal> value, which is initialized when
+ <literal role="sysvar">sql_mode</literal> value, which is initialized when
the client connects to the value of the global
- <literal>sql_mode</literal> value.
+ <literal role="sysvar">sql_mode</literal> value.
</para>
</listitem>
@@ -9889,7 +9889,7 @@
<para>
The number of threads that have taken more than
- <literal>slow_launch_time</literal> seconds to create. This
+ <literal role="sysvar">slow_launch_time</literal> seconds to create. This
variable was added in MySQL 3.23.15.
</para>
</listitem>
@@ -9915,7 +9915,7 @@
The number of merge passes that the sort algorithm has had
to do. If this value is large, you should consider
increasing the value of the
- <literal>sort_buffer_size</literal> system variable. This
+ <literal role="sysvar">sort_buffer_size</literal> system variable. This
variable was added in MySQL 3.23.28.
</para>
</listitem>
@@ -10340,18 +10340,18 @@
Beginning with MySQL 4.1, you can change the SQL mode at runtime
by using a <literal>SET [GLOBAL|SESSION]
sql_mode='<replaceable>modes</replaceable>'</literal> statement
- to set the <literal>sql_mode</literal> system value. Setting the
+ to set the <literal role="sysvar">sql_mode</literal> system value. Setting the
<literal>GLOBAL</literal> variable requires the
<literal role="priv">SUPER</literal> privilege and affects the
operation of all clients that connect from that time on. Setting
the <literal>SESSION</literal> variable affects only the current
client. Any client can change its own session
- <literal>sql_mode</literal> value at any time.
+ <literal role="sysvar">sql_mode</literal> value at any time.
</para>
<para>
You can retrieve the current global or session
- <literal>sql_mode</literal> value with the following statements:
+ <literal role="sysvar">sql_mode</literal> value with the following statements:
</para>
<programlisting>
@@ -14241,7 +14241,7 @@
</row>
<row>
<entry/>
- <entry><literal>ssl_cipher</literal></entry>
+ <entry><literal role="sysvar">ssl_cipher</literal></entry>
<entry/>
</row>
<row>
@@ -14279,7 +14279,7 @@
</informaltable>
<para>
- The <literal>ssl_type</literal>, <literal>ssl_cipher</literal>,
+ The <literal>ssl_type</literal>, <literal role="sysvar">ssl_cipher</literal>,
<literal>x509_issuer</literal>, and
<literal>x509_subject</literal> columns were added in MySQL
4.0.0.
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/installing.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1402 bytes
@@ -13457,7 +13457,7 @@
<listitem>
<para>
<literal>SERIALIZE</literal> is no longer a valid mode value
- for the <literal>sql_mode</literal> variable. You should use
+ for the <literal role="sysvar">sql_mode</literal> variable. You should use
<literal>SET TRANSACTION ISOLATION LEVEL
SERIALIZABLE</literal> instead. <literal>SERIALIZE</literal>
is no longer valid for the <option>--sql-mode</option>
@@ -13920,11 +13920,11 @@
</row>
<row>
<entry><literal>record_rnd_buffer</literal></entry>
- <entry><literal>read_rnd_buffer_size</literal></entry>
+ <entry><literal role="sysvar">read_rnd_buffer_size</literal></entry>
</row>
<row>
<entry><literal>sort_buffer</literal></entry>
- <entry><literal>sort_buffer_size</literal></entry>
+ <entry><literal role="sysvar">sort_buffer_size</literal></entry>
</row>
<row>
<entry><literal>warnings</literal></entry>
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/introduction.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1135 bytes
@@ -1188,7 +1188,7 @@
<command>mysqld</command> with the
<option>--sql-mode="<replaceable>mode_value</replaceable>"</option>
option. Beginning with MySQL 4.1, you can also change the mode
- at runtime by setting the <literal>sql_mode</literal> system
+ at runtime by setting the <literal role="sysvar">sql_mode</literal> system
variable with a <literal role="stmt" condition="set-option">SET
[GLOBAL|SESSION]
sql_mode='<replaceable>mode_value</replaceable>'</literal>
@@ -1238,7 +1238,7 @@
</programlisting>
<para>
- You can see that setting the <literal>sql_mode</literal> system
+ You can see that setting the <literal role="sysvar">sql_mode</literal> system
variable to <literal>'ANSI'</literal> enables all SQL mode
options that are relevant for ANSI mode as follows:
</para>
Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/news-3.22.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 792 bytes
@@ -1409,7 +1409,7 @@
<literal>MYSQL_READ_DEFAULT_GROUP</literal> to
<literal role="cfunc">mysql_options()</literal> to read the
following parameters from the MySQL option files:
- <literal>port</literal>, <literal>socket</literal>,
+ <literal>port</literal>, <literal role="sysvar">socket</literal>,
<literal>compress</literal>, <literal>password</literal>,
<literal>pipe</literal>, <literal>timeout</literal>,
<literal>user</literal>, <literal>init-command</literal>,
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/news-3.23.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1235 bytes
@@ -576,7 +576,7 @@
<para>
Fixed a bug in <literal role="stmt">SHOW VARIABLES</literal>
on 64-bit platforms. The bug was caused by incorrect
- declaration of variable <literal>server_id</literal>.
+ declaration of variable <literal role="sysvar">server_id</literal>.
</para>
</listitem>
@@ -2708,7 +2708,7 @@
<listitem>
<para>
- Added <literal>slave_net_timeout</literal> for replication.
+ Added <literal role="sysvar">slave_net_timeout</literal> for replication.
</para>
</listitem>
@@ -6608,7 +6608,7 @@
<listitem>
<para>
- Added the <literal>slow_launch_time</literal> variable and the
+ Added the <literal role="sysvar">slow_launch_time</literal> variable and the
<literal>Slow_launch_threads</literal> status variable to
<command>mysqld</command>. These can be examined with
<command>mysqladmin variables</command> and
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/news-4.0.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1159 bytes
@@ -1830,7 +1830,7 @@
<listitem>
<para>
Fixed bug with crash of server on some values of
- <literal>read_rnd_buffer_size</literal> (Bug #5492)
+ <literal role="sysvar">read_rnd_buffer_size</literal> (Bug #5492)
</para>
</listitem>
@@ -6045,7 +6045,7 @@
<listitem>
<para>
- Fixed a deadlock when <literal>relay_log_space_limit</literal>
+ Fixed a deadlock when <literal role="sysvar">relay_log_space_limit</literal>
was set to a too small value. (Bug #79)
</para>
</listitem>
@@ -8432,7 +8432,7 @@
<literal>record_buffer</literal> to
<literal role="sysvar">read_buffer_size</literal> and
<literal>record_rnd_buffer</literal> to
- <literal>read_rnd_buffer_size</literal>.
+ <literal role="sysvar">read_rnd_buffer_size</literal>.
</para>
</listitem>
Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/optimization.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 11, Lines Added: 11, Lines Deleted: 11; 5160 bytes
@@ -3346,7 +3346,7 @@
<para>
For each row, store a pair of values in a buffer (the sort
key and the row pointer). The size of the buffer is the
- value of the <literal>sort_buffer_size</literal> system
+ value of the <literal role="sysvar">sort_buffer_size</literal> system
variable.
</para>
</listitem>
@@ -3394,7 +3394,7 @@
the result file. To optimize this, we read in a big block of
row pointers, sort them, and use them to read the rows in
sorted order into a row buffer. The size of the buffer is
- the value of the <literal>read_rnd_buffer_size</literal>
+ the value of the <literal role="sysvar">read_rnd_buffer_size</literal>
system variable. The code for this step is in the
<filename>sql/records.cc</filename> source file.
</para>
@@ -3456,7 +3456,7 @@
Using the modified <literal>filesort</literal> algorithm, the
tuples are longer than the pairs used in the original method,
and fewer of them fit in the sort buffer (the size of which is
- given by <literal>sort_buffer_size</literal>). As a result, it
+ given by <literal role="sysvar">sort_buffer_size</literal>). As a result, it
is possible for the extra I/O to make the modified approach
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
@@ -3486,7 +3486,7 @@
<listitem>
<para>
- Increase the size of the <literal>sort_buffer_size</literal>
+ Increase the size of the <literal role="sysvar">sort_buffer_size</literal>
variable.
</para>
</listitem>
@@ -3494,7 +3494,7 @@
<listitem>
<para>
Increase the size of the
- <literal>read_rnd_buffer_size</literal> variable.
+ <literal role="sysvar">read_rnd_buffer_size</literal> variable.
</para>
</listitem>
@@ -5637,7 +5637,7 @@
<para>
For <command>mysqld</command>, external locking is controlled by
- the value of the <literal>skip_external_locking</literal> system
+ the value of the <literal role="sysvar">skip_external_locking</literal> system
variable. (Before MySQL 4.0.3, this variable is named
<literal>skip_locking</literal>.) When this variable is enabled,
external locking is disabled, and vice versa. From MySQL 4.0 on,
@@ -8000,7 +8000,7 @@
For variable names that end in <literal>_size</literal>, you
may need to specify them without <literal>_size</literal>.
For example, the old name for
- <literal>sort_buffer_size</literal> is
+ <literal role="sysvar">sort_buffer_size</literal> is
<literal>sort_buffer</literal>. The old name for
<literal role="sysvar">read_buffer_size</literal> is
<literal>record_buffer</literal>. To see which variables
@@ -8063,7 +8063,7 @@
If you are performing <literal>GROUP BY</literal> or
<literal>ORDER BY</literal> operations on tables that are much
larger than your available memory, you should increase the value
- of <literal>read_rnd_buffer_size</literal> to speed up the
+ of <literal role="sysvar">read_rnd_buffer_size</literal> to speed up the
reading of rows following sorting operations.
</para>
@@ -11686,7 +11686,7 @@
The thread has connected to the master and is waiting for
binary log events to arrive. This can last for a long time
if the master is idle. If the wait lasts for
- <literal>slave_net_timeout</literal> seconds, a timeout
+ <literal role="sysvar">slave_net_timeout</literal> seconds, a timeout
occurs. At that point, the thread considers the connection
to be broken and makes an attempt to reconnect.
</para>
@@ -11779,7 +11779,7 @@
<para>
You are using a non-zero
- <literal>relay_log_space_limit</literal> value, and the
+ <literal role="sysvar">relay_log_space_limit</literal> value, and the
relay logs have grown large enough that their combined
size exceeds this value. The I/O thread is waiting until
the SQL thread frees enough space by processing relay log
@@ -12769,7 +12769,7 @@
When reading rows in an arbitrary sequence (for example,
following a sort), a <firstterm>random-read
buffer</firstterm> (variable
- <literal>read_rnd_buffer_size</literal>) may be allocated in
+ <literal role="sysvar">read_rnd_buffer_size</literal>) may be allocated in
order to avoid disk seeks.
</para>
</listitem>
Modified: trunk/refman-4.1/programs-admin-util.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/programs-admin-util.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1606 bytes
@@ -713,7 +713,7 @@
<entry>262136</entry>
</row>
<row>
- <entry><literal>sort_buffer_size</literal></entry>
+ <entry><literal role="sysvar">sort_buffer_size</literal></entry>
<entry>2097144</entry>
</row>
<row>
@@ -747,7 +747,7 @@
</para>
<para>
- <literal>sort_buffer_size</literal> is used when the keys are
+ <literal role="sysvar">sort_buffer_size</literal> is used when the keys are
repaired by sorting keys, which is the normal case when you use
<option>--recover</option>.
</para>
@@ -793,7 +793,7 @@
<para>
If you want a faster repair, set the
<literal role="sysvar">key_buffer_size</literal> and
- <literal>sort_buffer_size</literal> variables to about 25% of
+ <literal role="sysvar">sort_buffer_size</literal> variables to about 25% of
your available memory. You can set both variables to large
values, because only one of them is used at a time.
</para>
@@ -1428,7 +1428,7 @@
<para>
If you have lots of memory, you should increase the value of
- <literal>sort_buffer_size</literal>.
+ <literal role="sysvar">sort_buffer_size</literal>.
</para>
</listitem>
Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/replication-options-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 12, Lines Added: 14, Lines Deleted: 14; 3883 bytes
@@ -20,7 +20,7 @@
section following this one).
</para>
- <para id="option_mysqld_server-id">
+ <para id="sysvar_server_id">
Of particular importance is the <option>--server-id</option> option,
which is common to both master and slave relication servers, and is
used in replication to enable master and slave servers to identify
@@ -191,7 +191,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_load_tmpdir">
+ <para id="sysvar_slave_load_tmpdir">
<indexterm>
<primary>slave_load_tmpdir system variable</primary>
</indexterm>
@@ -201,7 +201,7 @@
<secondary>slave_load_tmpdir</secondary>
</indexterm>
- <literal>slave_load_tmpdir</literal>
+ <literal role="sysvar">slave_load_tmpdir</literal>
</para>
<para>
@@ -214,7 +214,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_net_timeout">
+ <para id="sysvar_slave_net_timeout">
<indexterm>
<primary>slave_net_timeout system variable</primary>
</indexterm>
@@ -224,7 +224,7 @@
<secondary>slave_net_timeout</secondary>
</indexterm>
- <literal>slave_net_timeout</literal>
+ <literal role="sysvar">slave_net_timeout</literal>
</para>
<para>
@@ -247,7 +247,7 @@
<secondary>slave_skip_errors</secondary>
</indexterm>
- <literal>slave_skip_errors</literal>
+ <literal role="sysvar">slave_skip_errors</literal>
</para>
<para>
@@ -261,7 +261,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_transaction_retries">
+ <para id="sysvar_slave_transaction_retries">
<indexterm>
<primary>slave_transaction_retries system variable</primary>
</indexterm>
@@ -271,7 +271,7 @@
<secondary>slave_transaction_retries</secondary>
</indexterm>
- <literal>slave_transaction_retries</literal>
+ <literal role="sysvar">slave_transaction_retries</literal>
</para>
<para>
@@ -283,7 +283,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal> was exceeded, it
automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default in MySQL 4.1 is
<literal>0</literal>. You must explicitly set the value to
greater than 0 to enable the <quote>retry</quote> behavior,
@@ -915,8 +915,8 @@
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_space_limit">
- <literal>relay_log_space_limit</literal>
+ <para id="sysvar_relay_log_space_limit">
+ <literal role="sysvar">relay_log_space_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_space_limit"/>
@@ -928,7 +928,7 @@
<listitem>
<para id="option_mysqld_rpl-recovery-rank">
- <literal>rpl_recovery_rank</literal>
+ <literal role="sysvar">rpl_recovery_rank</literal>
</para>
<para>
@@ -1779,8 +1779,8 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_slave_skip_counter">
- <literal>sql_slave_skip_counter</literal>
+ <para id="sysvar_sql_slave_skip_counter">
+ <literal role="sysvar">sql_slave_skip_counter</literal>
</para>
<para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 3303 bytes
@@ -1689,7 +1689,7 @@
<para>
The <literal role="sysvar">foreign_key_checks</literal>
variable is replicated as of MySQL 4.0.14. The
- <literal>sql_mode</literal>,
+ <literal role="sysvar">sql_mode</literal>,
<literal role="sysvar">unique_checks</literal>,
<literal role="sysvar">sql_auto_is_null</literal>, and
<literal>storage_engine</literal> (also known as
@@ -1861,7 +1861,7 @@
<listitem>
<para>
Starting from MySQL 4.1.11, there is a global system variable
- <literal>slave_transaction_retries</literal>: If the
+ <literal role="sysvar">slave_transaction_retries</literal>: If the
replication slave SQL thread fails to execute a transaction
because of an <literal>InnoDB</literal> deadlock or because it
exceeded the <literal>InnoDB</literal>
@@ -1869,7 +1869,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal> value, the
transaction automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 0 in MySQL 4.1.
Starting from MySQL 4.1.11, the total retry count can be seen
in <literal role="stmt">SHOW STATUS</literal>; see
@@ -1886,7 +1886,7 @@
This can cause problems if no corresponding directory exists
in the slave host filesystem or if it exists but is not
accessible to the slave server. As of MySQL 4.0.15, there is
- an <literal>sql_mode</literal> option called
+ an <literal role="sysvar">sql_mode</literal> option called
<literal>NO_DIR_IN_CREATE</literal>. If the slave server is
run with this SQL mode enabled, it ignores the <literal>DATA
DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
@@ -2146,9 +2146,9 @@
<option>--master-connect-retry</option> option. A slave also
is able to deal with network connectivity outages. However,
the slave notices the network outage only after receiving no
- data from the master for <literal>slave_net_timeout</literal>
+ data from the master for <literal role="sysvar">slave_net_timeout</literal>
seconds. If your outages are short, you may want to decrease
- <literal>slave_net_timeout</literal>. See
+ <literal role="sysvar">slave_net_timeout</literal>. See
<xref linkend="server-system-variables"/>.
</para>
</listitem>
@@ -2960,7 +2960,7 @@
strictly true. For example, this can occur if the network
connection between master and slave is broken but the slave I/O
thread has not yet noticed this — that is,
- <literal>slave_net_timeout</literal> has not yet elapsed.
+ <literal role="sysvar">slave_net_timeout</literal> has not yet elapsed.
</para>
<para>
Modified: trunk/refman-4.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-4.1/sql-syntax-replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 738 bytes
@@ -571,7 +571,7 @@
<emphasis>deletes all relay log files</emphasis> and starts a
new one, unless you specify <literal>RELAY_LOG_FILE</literal> or
<literal>RELAY_LOG_POS</literal>. In that case, relay logs are
- kept; as of MySQL 4.1.1, the <literal>relay_log_purge</literal>
+ kept; as of MySQL 4.1.1, the <literal role="sysvar">relay_log_purge</literal>
global variable is set silently to 0.
</para>
Modified: trunk/refman-5.0/backup.xml
===================================================================
--- trunk/refman-5.0/backup.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/backup.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 691 bytes
@@ -1930,7 +1930,7 @@
<note>
<para>
If you want a repair operation to go much faster, you should
- set the values of the <literal>sort_buffer_size</literal> and
+ set the values of the <literal role="sysvar">sort_buffer_size</literal> and
<literal role="sysvar">key_buffer_size</literal> variables
each to about 25% of your available memory when running
<command>myisamchk</command>.
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/data-types.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes
@@ -3830,7 +3830,7 @@
To enable <literal>MAXDB</literal> mode, set the server SQL
mode to <literal>MAXDB</literal> at startup using the
<option>--sql-mode=MAXDB</option> server option or by setting
- the global <literal>sql_mode</literal> variable at runtime:
+ the global <literal role="sysvar">sql_mode</literal> variable at runtime:
</para>
<programlisting>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/dba-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 49, Lines Added: 59, Lines Deleted: 59; 17857 bytes
@@ -2213,7 +2213,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-external-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -6770,7 +6770,7 @@
writing to the client,
<literal role="sysvar">net_write_timeout</literal> is the
timeout value controlling when to abort. See also
- <literal>slave_net_timeout</literal>.
+ <literal role="sysvar">slave_net_timeout</literal>.
</para>
</listitem>
@@ -7411,14 +7411,14 @@
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_read_only">
+ <para id="sysvar_read_only">
<indexterm>
<primary>read_only system variable</primary>
</indexterm>
@@ -7428,7 +7428,7 @@
<secondary>read_only</secondary>
</indexterm>
- <literal>read_only</literal>
+ <literal role="sysvar">read_only</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:read_only"/>
@@ -7445,17 +7445,17 @@
</para>
<para>
- <literal>read_only</literal> exists only as a
+ <literal role="sysvar">read_only</literal> exists only as a
<literal>GLOBAL</literal> variable, so changes to its value
require the <literal role="priv">SUPER</literal> privilege.
- Changes to <literal>read_only</literal> on a master server
+ Changes to <literal role="sysvar">read_only</literal> on a master server
are not replicated to slave servers. The value can be set on
a slave server independent of the setting on the master.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_read_rnd_buffer_size">
+ <para id="sysvar_read_rnd_buffer_size">
<indexterm>
<primary>read_rnd_buffer_size system variable</primary>
</indexterm>
@@ -7465,7 +7465,7 @@
<secondary>read_rnd_buffer_size</secondary>
</indexterm>
- <literal>read_rnd_buffer_size</literal>
+ <literal role="sysvar">read_rnd_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:read_rnd_buffer_size"/>
@@ -7484,19 +7484,19 @@
<para>
The maximum allowable setting for
- <literal>read_rnd_buffer_size</literal> is 2GB.
+ <literal role="sysvar">read_rnd_buffer_size</literal> is 2GB.
</para>
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_secure_auth">
+ <para id="sysvar_secure_auth">
<indexterm>
<primary>secure_auth system variable</primary>
</indexterm>
@@ -7506,7 +7506,7 @@
<secondary>secure_auth</secondary>
</indexterm>
- <literal>secure_auth</literal>
+ <literal role="sysvar">secure_auth</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:secure-auth"/>
@@ -7534,7 +7534,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_file_priv">
+ <para id="sysvar_secure_file_priv">
<indexterm>
<primary>secure_file_priv system variable</primary>
</indexterm>
@@ -7544,7 +7544,7 @@
<secondary>secure_file_priv</secondary>
</indexterm>
- <literal>secure_file_priv</literal>
+ <literal role="sysvar">secure_file_priv</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:secure-file-priv"/>
@@ -7564,7 +7564,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory">
+ <para id="sysvar_shared_memory">
<indexterm>
<primary>shared_memory system variable</primary>
</indexterm>
@@ -7574,7 +7574,7 @@
<secondary>shared_memory</secondary>
</indexterm>
- <literal>shared_memory</literal>
+ <literal role="sysvar">shared_memory</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:shared_memory"/>
@@ -7586,7 +7586,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory_base_name">
+ <para id="sysvar_shared_memory_base_name">
<indexterm>
<primary>shared_memory_base_name system variable</primary>
</indexterm>
@@ -7596,7 +7596,7 @@
<secondary>shared_memory_base_name</secondary>
</indexterm>
- <literal>shared_memory_base_name</literal>
+ <literal role="sysvar">shared_memory_base_name</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:shared_memory_base_name"/>
@@ -7611,7 +7611,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-exernal-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -7630,7 +7630,7 @@
<secondary>skip_external_locking</secondary>
</indexterm>
- <literal>skip_external_locking</literal>
+ <literal role="sysvar">skip_external_locking</literal>
</para>
<para>
@@ -7651,7 +7651,7 @@
<secondary>skip_networking</secondary>
</indexterm>
- <literal>skip_networking</literal>
+ <literal role="sysvar">skip_networking</literal>
</para>
<para>
@@ -7667,7 +7667,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip_show_database">
+ <para id="sysvar_skip_show_database">
<indexterm>
<primary>skip_show_database system variable</primary>
</indexterm>
@@ -7677,7 +7677,7 @@
<secondary>skip_show_database</secondary>
</indexterm>
- <literal>skip_show_database</literal>
+ <literal role="sysvar">skip_show_database</literal>
</para>
<para>
@@ -7701,7 +7701,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_launch_time">
+ <para id="sysvar_slow_launch_time">
<indexterm>
<primary>slow_launch_time system variable</primary>
</indexterm>
@@ -7711,7 +7711,7 @@
<secondary>slow_launch_time</secondary>
</indexterm>
- <literal>slow_launch_time</literal>
+ <literal role="sysvar">slow_launch_time</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:slow_launch_time"/>
@@ -7734,7 +7734,7 @@
<secondary>socket</secondary>
</indexterm>
- <literal>socket</literal>
+ <literal role="sysvar">socket</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:socket"/>
@@ -7755,7 +7755,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sort_buffer_size">
+ <para id="sysvar_sort_buffer_size">
<indexterm>
<primary>sort_buffer_size system variable</primary>
</indexterm>
@@ -7765,7 +7765,7 @@
<secondary>sort_buffer_size</secondary>
</indexterm>
- <literal>sort_buffer_size</literal>
+ <literal role="sysvar">sort_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:sort_buffer_size"/>
@@ -7779,12 +7779,12 @@
<para>
The maximum allowable setting for
- <literal>sort_buffer_size</literal> is 4GB.
+ <literal role="sysvar">sort_buffer_size</literal> is 4GB.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_sql_mode">
+ <para id="sysvar_sql_mode">
<indexterm>
<primary>sql_mode system variable</primary>
</indexterm>
@@ -7794,7 +7794,7 @@
<secondary>sql_mode</secondary>
</indexterm>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:sql-mode"/>
@@ -7806,7 +7806,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_select_limit">
+ <para id="sysvar_sql_select_limit">
<indexterm>
<primary>sql_select_limit system variable</primary>
</indexterm>
@@ -7816,7 +7816,7 @@
<secondary>sql_select_limit</secondary>
</indexterm>
- <literal>sql_select_limit</literal>
+ <literal role="sysvar">sql_select_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:sql_select_limit"/>
@@ -7839,11 +7839,11 @@
If a <literal role="stmt">SELECT</literal> has a
<literal>LIMIT</literal> clause, the
<literal>LIMIT</literal> takes precedence over the value of
- <literal>sql_select_limit</literal>.
+ <literal role="sysvar">sql_select_limit</literal>.
</para>
<para>
- <literal>sql_select_limit</literal> does not apply to
+ <literal role="sysvar">sql_select_limit</literal> does not apply to
<literal role="stmt">SELECT</literal> statements executed
within stored routines. It also does not apply to
<literal role="stmt">SELECT</literal> statements that do not
@@ -7855,7 +7855,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-ca">
+ <para id="sysvar_ssl_ca">
<indexterm>
<primary>ssl_ca system variable</primary>
</indexterm>
@@ -7865,7 +7865,7 @@
<secondary>ssl_ca</secondary>
</indexterm>
- <literal>ssl_ca</literal>
+ <literal role="sysvar">ssl_ca</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:ssl-ca"/>
@@ -7877,7 +7877,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-capath">
+ <para id="sysvar_ssl_capath">
<indexterm>
<primary>ssl_capath system variable</primary>
</indexterm>
@@ -7887,7 +7887,7 @@
<secondary>ssl_capath</secondary>
</indexterm>
- <literal>ssl_capath</literal>
+ <literal role="sysvar">ssl_capath</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:ssl-capath"/>
@@ -7900,7 +7900,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cert">
+ <para id="sysvar_ssl_cert">
<indexterm>
<primary>ssl_cert system variable</primary>
</indexterm>
@@ -7910,7 +7910,7 @@
<secondary>ssl_cert</secondary>
</indexterm>
- <literal>ssl_cert</literal>
+ <literal role="sysvar">ssl_cert</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:ssl-cert"/>
@@ -7923,7 +7923,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cipher">
+ <para id="sysvar_ssl_cipher">
<indexterm>
<primary>ssl_cipher system variable</primary>
</indexterm>
@@ -7933,7 +7933,7 @@
<secondary>ssl_cipher</secondary>
</indexterm>
- <literal>ssl_cipher</literal>
+ <literal role="sysvar">ssl_cipher</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:ssl-cipher"/>
@@ -7945,7 +7945,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-key">
+ <para id="sysvar_ssl_key">
<indexterm>
<primary>ssl_key system variable</primary>
</indexterm>
@@ -7955,7 +7955,7 @@
<secondary>ssl_key</secondary>
</indexterm>
- <literal>ssl_key</literal>
+ <literal role="sysvar">ssl_key</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:ssl-key"/>
@@ -8385,7 +8385,7 @@
directory are lost when the server restarts, replication
fails. However, if you are using MySQL 4.0.0 or later, you
can set the slave's temporary directory using the
- <literal>slave_load_tmpdir</literal> variable. In that case,
+ <literal role="sysvar">slave_load_tmpdir</literal> variable. In that case,
the slave won't use the general <literal>tmpdir</literal>
value and you can set <literal>tmpdir</literal> to a
non-permanent location.
@@ -9501,9 +9501,9 @@
are initialized at connect time using the current values of
the corresponding global variables. For example, the
client's SQL mode is controlled by the session
- <literal>sql_mode</literal> value, which is initialized when
+ <literal role="sysvar">sql_mode</literal> value, which is initialized when
the client connects to the value of the global
- <literal>sql_mode</literal> value.
+ <literal role="sysvar">sql_mode</literal> value.
</para>
</listitem>
@@ -11623,7 +11623,7 @@
<para>
The number of threads that have taken more than
- <literal>slow_launch_time</literal> seconds to create.
+ <literal role="sysvar">slow_launch_time</literal> seconds to create.
</para>
</listitem>
@@ -11648,7 +11648,7 @@
The number of merge passes that the sort algorithm has had
to do. If this value is large, you should consider
increasing the value of the
- <literal>sort_buffer_size</literal> system variable.
+ <literal role="sysvar">sort_buffer_size</literal> system variable.
</para>
</listitem>
@@ -12119,18 +12119,18 @@
You can change the SQL mode at runtime by using a <literal>SET
[GLOBAL|SESSION]
sql_mode='<replaceable>modes</replaceable>'</literal> statement
- to set the <literal>sql_mode</literal> system value. Setting the
+ to set the <literal role="sysvar">sql_mode</literal> system value. Setting the
<literal>GLOBAL</literal> variable requires the
<literal role="priv">SUPER</literal> privilege and affects the
operation of all clients that connect from that time on. Setting
the <literal>SESSION</literal> variable affects only the current
client. Any client can change its own session
- <literal>sql_mode</literal> value at any time.
+ <literal role="sysvar">sql_mode</literal> value at any time.
</para>
<para>
You can retrieve the current global or session
- <literal>sql_mode</literal> value with the following statements:
+ <literal role="sysvar">sql_mode</literal> value with the following statements:
</para>
<programlisting>
@@ -12139,7 +12139,7 @@
</programlisting>
<para>
- The most important <literal>sql_mode</literal> values are
+ The most important <literal role="sysvar">sql_mode</literal> values are
probably these:
</para>
@@ -14280,7 +14280,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
</listitem>
@@ -16174,7 +16174,7 @@
</row>
<row>
<entry/>
- <entry><literal>ssl_cipher</literal></entry>
+ <entry><literal role="sysvar">ssl_cipher</literal></entry>
<entry/>
</row>
<row>
@@ -20177,7 +20177,7 @@
If strict SQL mode is enabled, all columns that have no default
value must have a value specified. In this case,
<literal role="stmt">INSERT</literal> statements must explicitly
- specify values for the <literal>ssl_cipher</literal>,
+ specify values for the <literal role="sysvar">ssl_cipher</literal>,
<literal>x509_issuer</literal>, and
<literal>x509_subject</literal> columns.
</para>
@@ -21581,7 +21581,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-verify-server-cert">
+ <para id="option_mysqld_ssl_verify-server-cert">
<indexterm>
<primary>ssl-verify-server-cert option</primary>
</indexterm>
Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/errors-problems.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 606 bytes
@@ -4092,7 +4092,7 @@
<para>
If you want MySQL to check all dates and accept only legal
dates (unless overridden by IGNORE), you should set
- <literal>sql_mode</literal> to
+ <literal role="sysvar">sql_mode</literal> to
<literal>"NO_ZERO_IN_DATE,NO_ZERO_DATE"</literal>.
</para>
Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/information-schema.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1002 bytes
@@ -2799,7 +2799,7 @@
-->
<row>
<entry><literal>SQL_MODE</literal></entry>
- <entry><literal>sql_mode</literal></entry>
+ <entry><literal role="sysvar">sql_mode</literal></entry>
<entry>MySQL extension</entry>
</row>
<row>
@@ -3260,7 +3260,7 @@
whenever it is invoked, <emphasis>regardless of the current
server SQL mode</emphasis>). The possible range of values for
this column is the same as that of the
- <literal>sql_mode</literal> system variable. See
+ <literal role="sysvar">sql_mode</literal> system variable. See
<xref linkend="server-sql-mode"/>.
</para>
</listitem>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/introduction.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1106 bytes
@@ -866,7 +866,7 @@
<command>mysqld</command> with the
<option>--sql-mode="<replaceable>mode_value</replaceable>"</option>
option. You can also change the mode at runtime by setting the
- <literal>sql_mode</literal> system variable with a
+ <literal role="sysvar">sql_mode</literal> system variable with a
<literal role="stmt" condition="set-option">SET [GLOBAL|SESSION]
sql_mode='<replaceable>mode_value</replaceable>'</literal>
statement.
@@ -915,7 +915,7 @@
</programlisting>
<para>
- You can see that setting the <literal>sql_mode</literal> system
+ You can see that setting the <literal role="sysvar">sql_mode</literal> system
variable to <literal>'ANSI'</literal> enables all SQL mode
options that are relevant for ANSI mode as follows:
</para>
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/optimization.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 10; 4644 bytes
@@ -4889,7 +4889,7 @@
<para>
For each row, store a pair of values in a buffer (the sort
key and the row pointer). The size of the buffer is the
- value of the <literal>sort_buffer_size</literal> system
+ value of the <literal role="sysvar">sort_buffer_size</literal> system
variable.
</para>
</listitem>
@@ -4937,7 +4937,7 @@
the result file. To optimize this, we read in a big block of
row pointers, sort them, and use them to read the rows in
sorted order into a row buffer. The size of the buffer is
- the value of the <literal>read_rnd_buffer_size</literal>
+ the value of the <literal role="sysvar">read_rnd_buffer_size</literal>
system variable. The code for this step is in the
<filename>sql/records.cc</filename> source file.
</para>
@@ -4999,7 +4999,7 @@
Using the modified <literal>filesort</literal> algorithm, the
tuples are longer than the pairs used in the original method,
and fewer of them fit in the sort buffer (the size of which is
- given by <literal>sort_buffer_size</literal>). As a result, it
+ given by <literal role="sysvar">sort_buffer_size</literal>). As a result, it
is possible for the extra I/O to make the modified approach
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
@@ -5029,7 +5029,7 @@
<listitem>
<para>
- Increase the size of the <literal>sort_buffer_size</literal>
+ Increase the size of the <literal role="sysvar">sort_buffer_size</literal>
variable.
</para>
</listitem>
@@ -5037,7 +5037,7 @@
<listitem>
<para>
Increase the size of the
- <literal>read_rnd_buffer_size</literal> variable.
+ <literal role="sysvar">read_rnd_buffer_size</literal> variable.
</para>
</listitem>
@@ -7896,7 +7896,7 @@
<para>
For <command>mysqld</command>, external locking is controlled by
- the value of the <literal>skip_external_locking</literal> system
+ the value of the <literal role="sysvar">skip_external_locking</literal> system
variable. (Before MySQL 4.0.3, this variable is named
<literal>skip_locking</literal>.) When this variable is enabled,
external locking is disabled, and vice versa. From MySQL 4.0 on,
@@ -10363,7 +10363,7 @@
If you are performing <literal>GROUP BY</literal> or
<literal>ORDER BY</literal> operations on tables that are much
larger than your available memory, you should increase the value
- of <literal>read_rnd_buffer_size</literal> to speed up the
+ of <literal role="sysvar">read_rnd_buffer_size</literal> to speed up the
reading of rows following sorting operations.
</para>
@@ -14101,7 +14101,7 @@
The thread has connected to the master and is waiting for
binary log events to arrive. This can last for a long time
if the master is idle. If the wait lasts for
- <literal>slave_net_timeout</literal> seconds, a timeout
+ <literal role="sysvar">slave_net_timeout</literal> seconds, a timeout
occurs. At that point, the thread considers the connection
to be broken and makes an attempt to reconnect.
</para>
@@ -14194,7 +14194,7 @@
<para>
You are using a non-zero
- <literal>relay_log_space_limit</literal> value, and the
+ <literal role="sysvar">relay_log_space_limit</literal> value, and the
relay logs have grown large enough that their combined
size exceeds this value. The I/O thread is waiting until
the SQL thread frees enough space by processing relay log
@@ -15183,7 +15183,7 @@
When reading rows in an arbitrary sequence (for example,
following a sort), a <firstterm>random-read
buffer</firstterm> (variable
- <literal>read_rnd_buffer_size</literal>) may be allocated in
+ <literal role="sysvar">read_rnd_buffer_size</literal>) may be allocated in
order to avoid disk seeks.
</para>
</listitem>
Modified: trunk/refman-5.0/precision-math.xml
===================================================================
--- trunk/refman-5.0/precision-math.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/precision-math.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1967 bytes
@@ -133,7 +133,7 @@
type. Similarly, you can treat division by zero as an error
rather than as an operation that produces a result of
<literal>NULL</literal>. The choice of which approach to take is
- determined by the setting of the <literal>sql_mode</literal>
+ determined by the setting of the <literal role="sysvar">sql_mode</literal>
system variable.
</para>
</listitem>
@@ -150,7 +150,7 @@
math works (including possible incompatibilities with older
applications). At the end, some examples are given that demonstrate
how MySQL ¤t-series; handles numeric operations precisely. For
- information about using the <literal>sql_mode</literal> system
+ information about using the <literal role="sysvar">sql_mode</literal> system
variable to control the SQL mode, see
<xref linkend="server-sql-mode"/>.
</para>
@@ -558,7 +558,7 @@
<para>
Inserts into numeric columns are affected by the SQL mode, which
- is controlled by the <literal>sql_mode</literal> system variable.
+ is controlled by the <literal role="sysvar">sql_mode</literal> system variable.
(See <xref linkend="server-sql-mode"/>.) The following discussion
mentions strict mode (selected by the
<literal>STRICT_ALL_TABLES</literal> or
@@ -661,7 +661,7 @@
<colspec colwidth="50*"/>
<tbody>
<row>
- <entry><emphasis role="bold"><literal>sql_mode</literal> Value</emphasis></entry>
+ <entry><emphasis role="bold"><literal role="sysvar">sql_mode</literal> Value</emphasis></entry>
<entry><emphasis role="bold">Result</emphasis></entry>
</row>
<row>
Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/programs-admin-util-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1621 bytes
@@ -820,7 +820,7 @@
<entry>262136</entry>
</row>
<row>
- <entry><literal>sort_buffer_size</literal></entry>
+ <entry><literal role="sysvar">sort_buffer_size</literal></entry>
<entry>2097144</entry>
</row>
<row>
@@ -854,7 +854,7 @@
</para>
<para>
- <literal>sort_buffer_size</literal> is used when the keys are
+ <literal role="sysvar">sort_buffer_size</literal> is used when the keys are
repaired by sorting keys, which is the normal case when you use
<option>--recover</option>.
</para>
@@ -900,7 +900,7 @@
<para>
If you want a faster repair, set the
<literal role="sysvar">key_buffer_size</literal> and
- <literal>sort_buffer_size</literal> variables to about 25% of
+ <literal role="sysvar">sort_buffer_size</literal> variables to about 25% of
your available memory. You can set both variables to large
values, because only one of them is used at a time.
</para>
@@ -1529,7 +1529,7 @@
<para>
If you have lots of memory, you should increase the value of
- <literal>sort_buffer_size</literal>.
+ <literal role="sysvar">sort_buffer_size</literal>.
</para>
</listitem>
Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/replication-configuration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 720 bytes
@@ -1450,7 +1450,7 @@
this is not strictly true. For example, this can occur if
the network connection between master and slave is broken
but the slave I/O thread has not yet noticed this —
- that is, <literal>slave_net_timeout</literal> has not yet
+ that is, <literal role="sysvar">slave_net_timeout</literal> has not yet
elapsed.
</para>
Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/replication-notes.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 5, Lines Deleted: 5; 2263 bytes
@@ -717,9 +717,9 @@
slave also is able to deal with network connectivity outages.
However, the slave notices the network outage only after
receiving no data from the master for
- <literal>slave_net_timeout</literal> seconds. If your outages
+ <literal role="sysvar">slave_net_timeout</literal> seconds. If your outages
are short, you may want to decrease
- <literal>slave_net_timeout</literal>. See
+ <literal role="sysvar">slave_net_timeout</literal>. See
<xref linkend="server-system-variables"/>.
</para>
@@ -982,7 +982,7 @@
<para>
In MySQL ¤t-series; (starting from 5.0.3), there is a
global system variable
- <literal>slave_transaction_retries</literal>: If the replication
+ <literal role="sysvar">slave_transaction_retries</literal>: If the replication
slave SQL thread fails to execute a transaction because of an
<literal>InnoDB</literal> deadlock or because it exceeded the
<literal>InnoDB</literal>
@@ -990,7 +990,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal> value, the
transaction automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 10. Starting from
MySQL 5.0.4, the total retry count can be seen in the output of
<literal role="stmt">SHOW STATUS</literal>; see
@@ -1195,7 +1195,7 @@
</para>
<para>
- <literal>sql_mode</literal> is also replicated except for the
+ <literal role="sysvar">sql_mode</literal> is also replicated except for the
<literal>NO_DIR_IN_CREATE</literal> mode. However, when
<command>mysqlbinlog</command> parses a <literal>SET @@sql_mode
= <replaceable>value</replaceable></literal> statement, the full
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/replication-options-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 13, Lines Added: 16, Lines Deleted: 16; 4602 bytes
@@ -20,7 +20,7 @@
section following this one).
</para>
- <para id="option_mysqld_server-id">
+ <para id="sysvar_server_id">
Of particular importance is the <option>--server-id</option> option,
which is common to both master and slave relication servers, and is
used in replication to enable master and slave servers to identify
@@ -483,7 +483,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_load_tmpdir">
+ <para id="sysvar_slave_load_tmpdir">
<indexterm>
<primary>slave_load_tmpdir system variable</primary>
</indexterm>
@@ -493,7 +493,7 @@
<secondary>slave_load_tmpdir</secondary>
</indexterm>
- <literal>slave_load_tmpdir</literal>
+ <literal role="sysvar">slave_load_tmpdir</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:slave-load-tmpdir"/>
@@ -507,7 +507,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_net_timeout">
+ <para id="sysvar_slave_net_timeout">
<indexterm>
<primary>slave_net_timeout system variable</primary>
</indexterm>
@@ -517,7 +517,7 @@
<secondary>slave_net_timeout</secondary>
</indexterm>
- <literal>slave_net_timeout</literal>
+ <literal role="sysvar">slave_net_timeout</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:slave-net-timeout"/>
@@ -541,7 +541,7 @@
<secondary>slave_skip_errors</secondary>
</indexterm>
- <literal>slave_skip_errors</literal>
+ <literal role="sysvar">slave_skip_errors</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:slave-skip-errors"/>
@@ -556,7 +556,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_transaction_retries">
+ <para id="sysvar_slave_transaction_retries">
<indexterm>
<primary>slave_transaction_retries system variable</primary>
</indexterm>
@@ -566,7 +566,7 @@
<secondary>slave_transaction_retries</secondary>
</indexterm>
- <literal>slave_transaction_retries</literal>
+ <literal role="sysvar">slave_transaction_retries</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:slave_transaction_retries"/>
@@ -579,7 +579,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal>, it
automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default prior to MySQL 4.0.3 is 0.
You must explicitly set the value greater than 0 to enable the
<quote>retry</quote> behavior, which is probably a good idea.
@@ -1205,8 +1205,8 @@
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_purge">
- <literal>relay_log_purge</literal>
+ <para id="sysvar_relay_log_purge">
+ <literal role="sysvar">relay_log_purge</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_purge"/>
@@ -1219,8 +1219,8 @@
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_space_limit">
- <literal>relay_log_space_limit</literal>
+ <para id="sysvar_relay_log_space_limit">
+ <literal role="sysvar">relay_log_space_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_space_limit"/>
@@ -1232,7 +1232,7 @@
<listitem>
<para id="option_mysqld_rpl-recovery-rank">
- <literal>rpl_recovery_rank</literal>
+ <literal role="sysvar">rpl_recovery_rank</literal>
</para>
<para>
@@ -2083,8 +2083,8 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_slave_skip_counter">
- <literal>sql_slave_skip_counter</literal>
+ <para id="sysvar_sql_slave_skip_counter">
+ <literal role="sysvar">sql_slave_skip_counter</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:sql_slave_skip_counter"/>
Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1460 bytes
@@ -2057,7 +2057,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a routine is created, and
always executes the routine with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
@@ -2347,7 +2347,7 @@
Before MySQL 5.0.18, parameters, return values, and local
variables are treated as items in expressions, and are subject to
automatic (silent) conversion and truncation. Stored functions
- ignore the <literal>sql_mode</literal> setting.
+ ignore the <literal role="sysvar">sql_mode</literal> setting.
</para>
<para>
@@ -4391,7 +4391,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a trigger is created, and
always executes the trigger with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
Modified: trunk/refman-5.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/sql-syntax-replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 719 bytes
@@ -567,7 +567,7 @@
<emphasis>deletes all relay log files</emphasis> and starts a
new one, unless you specify <literal>RELAY_LOG_FILE</literal> or
<literal>RELAY_LOG_POS</literal>. In that case, relay logs are
- kept; the <literal>relay_log_purge</literal> global variable is
+ kept; the <literal role="sysvar">relay_log_purge</literal> global variable is
set silently to 0.
</para>
Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 504 bytes
@@ -8148,7 +8148,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para>
Modified: trunk/refman-5.1/backup.xml
===================================================================
--- trunk/refman-5.1/backup.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/backup.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 691 bytes
@@ -1939,7 +1939,7 @@
<note>
<para>
If you want a repair operation to go much faster, you should
- set the values of the <literal>sort_buffer_size</literal> and
+ set the values of the <literal role="sysvar">sort_buffer_size</literal> and
<literal role="sysvar">key_buffer_size</literal> variables
each to about 25% of your available memory when running
<command>myisamchk</command>.
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/data-types.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes
@@ -3645,7 +3645,7 @@
To enable <literal>MAXDB</literal> mode, set the server SQL
mode to <literal>MAXDB</literal> at startup using the
<option>--sql-mode=MAXDB</option> server option or by setting
- the global <literal>sql_mode</literal> variable at runtime:
+ the global <literal role="sysvar">sql_mode</literal> variable at runtime:
</para>
<programlisting>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/dba-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 72, Lines Added: 85, Lines Deleted: 85; 26237 bytes
@@ -2491,7 +2491,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-external-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -7077,7 +7077,7 @@
writing to the client,
<literal role="sysvar">net_write_timeout</literal> is the
timeout value controlling when to abort. See also
- <literal>slave_net_timeout</literal>.
+ <literal role="sysvar">slave_net_timeout</literal>.
</para>
</listitem>
@@ -7755,14 +7755,14 @@
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_read_only">
+ <para id="sysvar_read_only">
<indexterm>
<primary>read_only system variable</primary>
</indexterm>
@@ -7772,7 +7772,7 @@
<secondary>read_only</secondary>
</indexterm>
- <literal>read_only</literal>
+ <literal role="sysvar">read_only</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:read_only"/>
@@ -7789,10 +7789,10 @@
</para>
<para>
- <literal>read_only</literal> exists only as a
+ <literal role="sysvar">read_only</literal> exists only as a
<literal>GLOBAL</literal> variable, so changes to its value
require the <literal role="priv">SUPER</literal> privilege.
- Changes to <literal>read_only</literal> on a master server
+ Changes to <literal role="sysvar">read_only</literal> on a master server
are not replicated to slave servers. The value can be set on
a slave server independent of the setting on the master.
</para>
@@ -7805,7 +7805,7 @@
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal>
+ If you attempt to enable <literal role="sysvar">read_only</literal>
while you have any explicit locks (acquired with
<literal role="stmt">LOCK TABLES</literal>) or have a
pending transaction, an error occurs.
@@ -7814,20 +7814,20 @@
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal>
+ If you attempt to enable <literal role="sysvar">read_only</literal>
while other clients hold explicit table locks or have
pending transactions, the attempt blocks until the locks
are released and the transactions end. While the attempt
- to enable <literal>read_only</literal> is pending,
+ to enable <literal role="sysvar">read_only</literal> is pending,
requests by other clients for table locks or to begin
transactions also block until
- <literal>read_only</literal> has been set.
+ <literal role="sysvar">read_only</literal> has been set.
</para>
</listitem>
<listitem>
<para>
- <literal>read_only</literal> can be enabled while you
+ <literal role="sysvar">read_only</literal> can be enabled while you
hold a global read lock (acquired with
<literal role="stmt" condition="flush">FLUSH TABLES WITH
READ LOCK</literal>) because that does not involve table
@@ -7839,7 +7839,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_read_rnd_buffer_size">
+ <para id="sysvar_read_rnd_buffer_size">
<indexterm>
<primary>read_rnd_buffer_size system variable</primary>
</indexterm>
@@ -7849,7 +7849,7 @@
<secondary>read_rnd_buffer_size</secondary>
</indexterm>
- <literal>read_rnd_buffer_size</literal>
+ <literal role="sysvar">read_rnd_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:read_rnd_buffer_size"/>
@@ -7868,19 +7868,19 @@
<para>
The maximum allowable setting for
- <literal>read_rnd_buffer_size</literal> is 2GB.
+ <literal role="sysvar">read_rnd_buffer_size</literal> is 2GB.
</para>
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_purge">
+ <para id="sysvar_relay_log_purge">
<indexterm>
<primary>relay_log_purge system variable</primary>
</indexterm>
@@ -7890,7 +7890,7 @@
<secondary>relay_log_purge</secondary>
</indexterm>
- <literal>relay_log_purge</literal>
+ <literal role="sysvar">relay_log_purge</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_purge"/>
@@ -7903,7 +7903,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_space_limit">
+ <para id="sysvar_relay_log_space_limit">
<indexterm>
<primary>relay_log_space_limit system variable</primary>
</indexterm>
@@ -7913,7 +7913,7 @@
<secondary>relay_log_space_limit</secondary>
</indexterm>
- <literal>relay_log_space_limit</literal>
+ <literal role="sysvar">relay_log_space_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_space_limit"/>
@@ -7934,7 +7934,7 @@
<secondary>report_host</secondary>
</indexterm>
- <literal>report_host</literal>
+ <literal role="sysvar">report_host</literal>
</para>
<para>
@@ -7954,7 +7954,7 @@
<secondary>report_password</secondary>
</indexterm>
- <literal>report_password</literal>
+ <literal role="sysvar">report_password</literal>
</para>
<para>
@@ -7974,7 +7974,7 @@
<secondary>report_port</secondary>
</indexterm>
- <literal>report_port</literal>
+ <literal role="sysvar">report_port</literal>
</para>
<para>
@@ -7994,7 +7994,7 @@
<secondary>report_user</secondary>
</indexterm>
- <literal>report_user</literal>
+ <literal role="sysvar">report_user</literal>
</para>
<para>
@@ -8014,7 +8014,7 @@
<secondary>rpl_recovery_rank</secondary>
</indexterm>
- <literal>rpl_recovery_rank</literal>
+ <literal role="sysvar">rpl_recovery_rank</literal>
</para>
<para>
@@ -8023,7 +8023,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_auth">
+ <para id="sysvar_secure_auth">
<indexterm>
<primary>secure_auth system variable</primary>
</indexterm>
@@ -8033,7 +8033,7 @@
<secondary>secure_auth</secondary>
</indexterm>
- <literal>secure_auth</literal>
+ <literal role="sysvar">secure_auth</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:secure-auth"/>
@@ -8061,7 +8061,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_file_priv">
+ <para id="sysvar_secure_file_priv">
<indexterm>
<primary>secure_file_priv system variable</primary>
</indexterm>
@@ -8071,7 +8071,7 @@
<secondary>secure_file_priv</secondary>
</indexterm>
- <literal>secure_file_priv</literal>
+ <literal role="sysvar">secure_file_priv</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:secure-file-priv"/>
@@ -8091,7 +8091,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory">
+ <para id="sysvar_shared_memory">
<indexterm>
<primary>shared_memory system variable</primary>
</indexterm>
@@ -8101,7 +8101,7 @@
<secondary>shared_memory</secondary>
</indexterm>
- <literal>shared_memory</literal>
+ <literal role="sysvar">shared_memory</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:shared_memory"/>
@@ -8113,7 +8113,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory_base_name">
+ <para id="sysvar_shared_memory_base_name">
<indexterm>
<primary>shared_memory_base_name system variable</primary>
</indexterm>
@@ -8123,7 +8123,7 @@
<secondary>shared_memory_base_name</secondary>
</indexterm>
- <literal>shared_memory_base_name</literal>
+ <literal role="sysvar">shared_memory_base_name</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:shared_memory_base_name"/>
@@ -8138,7 +8138,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-exernal-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -8157,7 +8157,7 @@
<secondary>skip_external_locking</secondary>
</indexterm>
- <literal>skip_external_locking</literal>
+ <literal role="sysvar">skip_external_locking</literal>
</para>
<para>
@@ -8178,7 +8178,7 @@
<secondary>skip_networking</secondary>
</indexterm>
- <literal>skip_networking</literal>
+ <literal role="sysvar">skip_networking</literal>
</para>
<para>
@@ -8194,7 +8194,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip_show_database">
+ <para id="sysvar_skip_show_database">
<indexterm>
<primary>skip_show_database system variable</primary>
</indexterm>
@@ -8204,7 +8204,7 @@
<secondary>skip_show_database</secondary>
</indexterm>
- <literal>skip_show_database</literal>
+ <literal role="sysvar">skip_show_database</literal>
</para>
<para>
@@ -8228,7 +8228,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_launch_time">
+ <para id="sysvar_slow_launch_time">
<indexterm>
<primary>slow_launch_time system variable</primary>
</indexterm>
@@ -8238,7 +8238,7 @@
<secondary>slow_launch_time</secondary>
</indexterm>
- <literal>slow_launch_time</literal>
+ <literal role="sysvar">slow_launch_time</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slow_launch_time"/>
@@ -8251,7 +8251,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_query_log">
+ <para id="sysvar_slow_query_log">
<indexterm>
<primary>slow_query_log system variable</primary>
</indexterm>
@@ -8261,7 +8261,7 @@
<secondary>slow_query_log</secondary>
</indexterm>
- <literal>slow_query_log</literal>
+ <literal role="sysvar">slow_query_log</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slow_query_log"/>
@@ -8276,13 +8276,13 @@
by the <literal role="sysvar">log_output</literal> system
variable; if that value is <literal>NONE</literal>, no log
entries are written even if the log is enabled. The
- <literal>slow_query_log</literal> variable was added in
+ <literal role="sysvar">slow_query_log</literal> variable was added in
MySQL 5.1.12.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_slow_query_log_file">
+ <para id="sysvar_slow_query_log_file">
<indexterm>
<primary>slow_query_log_file system variable</primary>
</indexterm>
@@ -8292,7 +8292,7 @@
<secondary>slow_query_log_file</secondary>
</indexterm>
- <literal>slow_query_log_file</literal>
+ <literal role="sysvar">slow_query_log_file</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slow_query_log_file"/>
@@ -8318,7 +8318,7 @@
<secondary>socket</secondary>
</indexterm>
- <literal>socket</literal>
+ <literal role="sysvar">socket</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:socket"/>
@@ -8339,7 +8339,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sort_buffer_size">
+ <para id="sysvar_sort_buffer_size">
<indexterm>
<primary>sort_buffer_size system variable</primary>
</indexterm>
@@ -8349,7 +8349,7 @@
<secondary>sort_buffer_size</secondary>
</indexterm>
- <literal>sort_buffer_size</literal>
+ <literal role="sysvar">sort_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:sort_buffer_size"/>
@@ -8363,7 +8363,7 @@
<para>
The maximum allowable setting for
- <literal>sort_buffer_size</literal> is 4GB. As of MySQL
+ <literal role="sysvar">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).
@@ -8371,7 +8371,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_mode">
+ <para id="sysvar_sql_mode">
<indexterm>
<primary>sql_mode system variable</primary>
</indexterm>
@@ -8381,7 +8381,7 @@
<secondary>sql_mode</secondary>
</indexterm>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:sql-mode"/>
@@ -8393,7 +8393,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_select_limit">
+ <para id="sysvar_sql_select_limit">
<indexterm>
<primary>sql_select_limit system variable</primary>
</indexterm>
@@ -8403,7 +8403,7 @@
<secondary>sql_select_limit</secondary>
</indexterm>
- <literal>sql_select_limit</literal>
+ <literal role="sysvar">sql_select_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:sql_select_limit"/>
@@ -8426,11 +8426,11 @@
If a <literal role="stmt">SELECT</literal> has a
<literal>LIMIT</literal> clause, the
<literal>LIMIT</literal> takes precedence over the value of
- <literal>sql_select_limit</literal>.
+ <literal role="sysvar">sql_select_limit</literal>.
</para>
<para>
- <literal>sql_select_limit</literal> does not apply to
+ <literal role="sysvar">sql_select_limit</literal> does not apply to
<literal role="stmt">SELECT</literal> statements executed
within stored routines. It also does not apply to
<literal role="stmt">SELECT</literal> statements that do not
@@ -8442,7 +8442,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-ca">
+ <para id="sysvar_ssl_ca">
<indexterm>
<primary>ssl_ca system variable</primary>
</indexterm>
@@ -8452,7 +8452,7 @@
<secondary>ssl_ca</secondary>
</indexterm>
- <literal>ssl_ca</literal>
+ <literal role="sysvar">ssl_ca</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:ssl-ca"/>
@@ -8464,7 +8464,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-capath">
+ <para id="sysvar_ssl_capath">
<indexterm>
<primary>ssl_capath system variable</primary>
</indexterm>
@@ -8474,7 +8474,7 @@
<secondary>ssl_capath</secondary>
</indexterm>
- <literal>ssl_capath</literal>
+ <literal role="sysvar">ssl_capath</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:ssl-capath"/>
@@ -8487,7 +8487,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cert">
+ <para id="sysvar_ssl_cert">
<indexterm>
<primary>ssl_cert system variable</primary>
</indexterm>
@@ -8497,7 +8497,7 @@
<secondary>ssl_cert</secondary>
</indexterm>
- <literal>ssl_cert</literal>
+ <literal role="sysvar">ssl_cert</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:ssl-cert"/>
@@ -8510,7 +8510,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cipher">
+ <para id="sysvar_ssl_cipher">
<indexterm>
<primary>ssl_cipher system variable</primary>
</indexterm>
@@ -8520,7 +8520,7 @@
<secondary>ssl_cipher</secondary>
</indexterm>
- <literal>ssl_cipher</literal>
+ <literal role="sysvar">ssl_cipher</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:ssl-cipher"/>
@@ -8532,7 +8532,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-key">
+ <para id="sysvar_ssl_key">
<indexterm>
<primary>ssl_key system variable</primary>
</indexterm>
@@ -8542,7 +8542,7 @@
<secondary>ssl_key</secondary>
</indexterm>
- <literal>ssl_key</literal>
+ <literal role="sysvar">ssl_key</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:ssl-key"/>
@@ -9053,7 +9053,7 @@
directory are lost when the server restarts, replication
fails. However, if you are using MySQL 4.0.0 or later, you
can set the slave's temporary directory using the
- <literal>slave_load_tmpdir</literal> variable. In that case,
+ <literal role="sysvar">slave_load_tmpdir</literal> variable. In that case,
the slave won't use the general <literal>tmpdir</literal>
value and you can set <literal>tmpdir</literal> to a
non-permanent location.
@@ -10126,9 +10126,9 @@
are initialized at connect time using the current values of
the corresponding global variables. For example, the
client's SQL mode is controlled by the session
- <literal>sql_mode</literal> value, which is initialized when
+ <literal role="sysvar">sql_mode</literal> value, which is initialized when
the client connects to the value of the global
- <literal>sql_mode</literal> value.
+ <literal role="sysvar">sql_mode</literal> value.
</para>
</listitem>
@@ -12226,7 +12226,7 @@
<para>
The number of threads that have taken more than
- <literal>slow_launch_time</literal> seconds to create.
+ <literal role="sysvar">slow_launch_time</literal> seconds to create.
</para>
</listitem>
@@ -12251,7 +12251,7 @@
The number of merge passes that the sort algorithm has had
to do. If this value is large, you should consider
increasing the value of the
- <literal>sort_buffer_size</literal> system variable.
+ <literal role="sysvar">sort_buffer_size</literal> system variable.
</para>
</listitem>
@@ -12719,13 +12719,13 @@
You can change the SQL mode at runtime by using a <literal>SET
[GLOBAL|SESSION]
sql_mode='<replaceable>modes</replaceable>'</literal> statement
- to set the <literal>sql_mode</literal> system value. Setting the
+ to set the <literal role="sysvar">sql_mode</literal> system value. Setting the
<literal>GLOBAL</literal> variable requires the
<literal role="priv">SUPER</literal> privilege and affects the
operation of all clients that connect from that time on. Setting
the <literal>SESSION</literal> variable affects only the current
client. Any client can change its own session
- <literal>sql_mode</literal> value at any time.
+ <literal role="sysvar">sql_mode</literal> value at any time.
</para>
<important>
@@ -12752,7 +12752,7 @@
<para>
You can retrieve the current global or session
- <literal>sql_mode</literal> value with the following statements:
+ <literal role="sysvar">sql_mode</literal> value with the following statements:
</para>
<programlisting>
@@ -12761,7 +12761,7 @@
</programlisting>
<para>
- The most important <literal>sql_mode</literal> values are
+ The most important <literal role="sysvar">sql_mode</literal> values are
probably these:
</para>
@@ -14451,7 +14451,7 @@
<listitem>
<para>
The global <literal role="sysvar">general_log</literal> and
- <literal>slow_query_log</literal> variables indicate whether
+ <literal role="sysvar">slow_query_log</literal> variables indicate whether
the general query log and slow query log are enabled
(<literal>ON</literal>) or disabled
(<literal>OFF</literal>). You can set these variables at
@@ -14462,7 +14462,7 @@
<listitem>
<para>
The global <literal role="sysvar">general_log_file</literal>
- and <literal>slow_query_log_file</literal> variables
+ and <literal role="sysvar">slow_query_log_file</literal> variables
indicate the names of the general query log and slow query
log files. As of MySQL 5.1.29, you can set these variables
at server startup or at runtime to change the names of the
@@ -14579,7 +14579,7 @@
table, you can use the following strategy. The example uses
the general query log; the procedure for the slow query log
is similar but uses the <literal>slow_log</literal> table
- and <literal>slow_query_log</literal> system variable.
+ and <literal role="sysvar">slow_query_log</literal> system variable.
</para>
<programlisting>
@@ -14633,7 +14633,7 @@
<listitem>
<para>
The global read lock and the state of the global
- <literal>read_only</literal> system variable have no effect
+ <literal role="sysvar">read_only</literal> system variable have no effect
on log tables. The server can always write to the log
tables.
</para>
@@ -15490,7 +15490,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
</listitem>
@@ -16479,9 +16479,9 @@
<para>
For runtime control of the general query log, use the global
- <literal>slow_query_log</literal> and
- <literal>slow_query_log_file</literal> system variables. Set
- <literal>slow_query_log</literal> to 0 (or
+ <literal role="sysvar">slow_query_log</literal> and
+ <literal role="sysvar">slow_query_log_file</literal> system variables. Set
+ <literal role="sysvar">slow_query_log</literal> to 0 (or
<literal>OFF</literal>) to disable the log or to 1 (or
<literal>ON</literal>) to enable it. Set
<literal role="sysvar">general_log_file</literal> to specify the
@@ -18347,7 +18347,7 @@
</row>
<row>
<entry/>
- <entry><literal>ssl_cipher</literal></entry>
+ <entry><literal role="sysvar">ssl_cipher</literal></entry>
<entry/>
</row>
<row>
@@ -22348,7 +22348,7 @@
If strict SQL mode is enabled, all columns that have no default
value must have a value specified. In this case,
<literal role="stmt">INSERT</literal> statements must explicitly
- specify values for the <literal>ssl_cipher</literal>,
+ specify values for the <literal role="sysvar">ssl_cipher</literal>,
<literal>x509_issuer</literal>, and
<literal>x509_subject</literal> columns.
</para>
@@ -23761,7 +23761,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-verify-server-cert">
+ <para id="option_mysqld_ssl_verify-server-cert">
<indexterm>
<primary>ssl-verify-server-cert option</primary>
</indexterm>
Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/errors-problems-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 621 bytes
@@ -4095,7 +4095,7 @@
<para>
If you want MySQL to check all dates and accept only legal
dates (unless overridden by IGNORE), you should set
- <literal>sql_mode</literal> to
+ <literal role="sysvar">sql_mode</literal> to
<literal>"NO_ZERO_IN_DATE,NO_ZERO_DATE"</literal>.
</para>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/functions-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 840 bytes
@@ -17558,14 +17558,14 @@
<listitem>
<para>
- The <literal>server_id</literal> of the current host is
+ The <literal role="sysvar">server_id</literal> of the current host is
unique among your set of master and slave servers
</para>
</listitem>
<listitem>
<para>
- <literal>server_id</literal> is between 0 and 255
+ <literal role="sysvar">server_id</literal> is between 0 and 255
</para>
</listitem>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/information-schema.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1002 bytes
@@ -2816,7 +2816,7 @@
-->
<row>
<entry><literal>SQL_MODE</literal></entry>
- <entry><literal>sql_mode</literal></entry>
+ <entry><literal role="sysvar">sql_mode</literal></entry>
<entry>MySQL extension</entry>
</row>
<row>
@@ -3335,7 +3335,7 @@
whenever it is invoked, <emphasis>regardless of the current
server SQL mode</emphasis>). The possible range of values for
this column is the same as that of the
- <literal>sql_mode</literal> system variable. See
+ <literal role="sysvar">sql_mode</literal> system variable. See
<xref linkend="server-sql-mode"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/installing-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 2682 bytes
@@ -13189,14 +13189,14 @@
<para>
<emphasis role="bold">Incompatible change</emphasis>: As of
MySQL 5.1.15, the following conditions apply to enabling the
- <literal>read_only</literal> system variable:
+ <literal role="sysvar">read_only</literal> system variable:
</para>
<itemizedlist>
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal>
+ If you attempt to enable <literal role="sysvar">read_only</literal>
while you have any explicit locks (acquired with
<literal role="stmt">LOCK TABLES</literal> or have a
pending transaction, an error will occur.
@@ -13207,18 +13207,18 @@
<para>
If other clients hold explicit table locks or have
pending transactions, the attempt to enable
- <literal>read_only</literal> blocks until the locks are
+ <literal role="sysvar">read_only</literal> blocks until the locks are
released and the transactions end. While the attempt to
- enable <literal>read_only</literal> is pending, requests
+ enable <literal role="sysvar">read_only</literal> is pending, requests
by other clients for table locks or to begin
transactions also block until
- <literal>read_only</literal> has been set.
+ <literal role="sysvar">read_only</literal> has been set.
</para>
</listitem>
<listitem>
<para>
- <literal>read_only</literal> can be enabled while you
+ <literal role="sysvar">read_only</literal> can be enabled while you
hold a global read lock (acquired with
<literal role="stmt" condition="flush">FLUSH TABLES WITH
READ LOCK</literal>) because that does not involve table
@@ -13243,7 +13243,7 @@
<para>
Previously, the attempt to enable
- <literal>read_only</literal> would return immediately even
+ <literal role="sysvar">read_only</literal> would return immediately even
if explicit locks or transactions were pending, so some data
changes could occur for statements executing in the server
at the same time.
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/introduction.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1110 bytes
@@ -1048,7 +1048,7 @@
<command>mysqld</command> with the
<option>--sql-mode="<replaceable>mode_value</replaceable>"</option>
option. You can also change the mode at runtime by setting the
- <literal>sql_mode</literal> system variable with a
+ <literal role="sysvar">sql_mode</literal> system variable with a
<literal role="stmt" condition="set-option">SET [GLOBAL|SESSION]
sql_mode='<replaceable>mode_value</replaceable>'</literal>
statement.
@@ -1097,7 +1097,7 @@
</programlisting>
<para>
- You can see that setting the <literal>sql_mode</literal> system
+ You can see that setting the <literal role="sysvar">sql_mode</literal> system
variable to <literal>'ANSI'</literal> enables all SQL mode
options that are relevant for ANSI mode as follows:
</para>
Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/mysql-cluster-replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 2153 bytes
@@ -529,7 +529,7 @@
<para>
See
- <link linkend="option_mysqld_slave_exec_mode"><literal>Slave_exec_mode</literal></link>,
+ <link linkend="sysvar_slave_exec_mode"><literal>Slave_exec_mode</literal></link>,
for more information.
</para>
</important>
@@ -2594,7 +2594,7 @@
<para>
See
- <link linkend="option_mysqld_slave_exec_mode"><literal>Slave_exec_mode</literal></link>,
+ <link linkend="sysvar_slave_exec_mode"><literal>Slave_exec_mode</literal></link>,
for more information.
</para>
</important>
@@ -2986,7 +2986,7 @@
<listitem>
<formalpara>
- <title><literal>server_id</literal></title>
+ <title><literal role="sysvar">server_id</literal></title>
<para>
The unique server ID of the MySQL instance (SQL node)
@@ -3260,7 +3260,7 @@
the original table's primary key columns are not critical;
however, we suggest for reasons of clarity and consistency,
that you use the names shown here for the
- <literal>server_id</literal>,
+ <literal role="sysvar">server_id</literal>,
<literal>master_server_id</literal>,
<literal>master_epoch</literal>, and
<literal>count</literal> columns, and that you use the same
@@ -3355,7 +3355,7 @@
<para>
Inserting a 0 into the
- <literal>server_id</literal> indicates that all
+ <literal role="sysvar">server_id</literal> indicates that all
SQL nodes accessing this table should use conflict
resolution. If you want to use conflict resolution
on a specific <command>mysqld</command> only, use
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/optimization.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 10; 4644 bytes
@@ -5025,7 +5025,7 @@
<para>
For each row, store a pair of values in a buffer (the sort
key and the row pointer). The size of the buffer is the
- value of the <literal>sort_buffer_size</literal> system
+ value of the <literal role="sysvar">sort_buffer_size</literal> system
variable.
</para>
</listitem>
@@ -5073,7 +5073,7 @@
the result file. To optimize this, we read in a big block of
row pointers, sort them, and use them to read the rows in
sorted order into a row buffer. The size of the buffer is
- the value of the <literal>read_rnd_buffer_size</literal>
+ the value of the <literal role="sysvar">read_rnd_buffer_size</literal>
system variable. The code for this step is in the
<filename>sql/records.cc</filename> source file.
</para>
@@ -5135,7 +5135,7 @@
Using the modified <literal>filesort</literal> algorithm, the
tuples are longer than the pairs used in the original method,
and fewer of them fit in the sort buffer (the size of which is
- given by <literal>sort_buffer_size</literal>). As a result, it
+ given by <literal role="sysvar">sort_buffer_size</literal>). As a result, it
is possible for the extra I/O to make the modified approach
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
@@ -5165,7 +5165,7 @@
<listitem>
<para>
- Increase the size of the <literal>sort_buffer_size</literal>
+ Increase the size of the <literal role="sysvar">sort_buffer_size</literal>
variable.
</para>
</listitem>
@@ -5173,7 +5173,7 @@
<listitem>
<para>
Increase the size of the
- <literal>read_rnd_buffer_size</literal> variable.
+ <literal role="sysvar">read_rnd_buffer_size</literal> variable.
</para>
</listitem>
@@ -8735,7 +8735,7 @@
<para>
For <command>mysqld</command>, external locking is controlled by
- the value of the <literal>skip_external_locking</literal> system
+ the value of the <literal role="sysvar">skip_external_locking</literal> system
variable. (Before MySQL 4.0.3, this variable is named
<literal>skip_locking</literal>.) When this variable is enabled,
external locking is disabled, and vice versa. From MySQL 4.0 on,
@@ -11340,7 +11340,7 @@
If you are performing <literal>GROUP BY</literal> or
<literal>ORDER BY</literal> operations on tables that are much
larger than your available memory, you should increase the value
- of <literal>read_rnd_buffer_size</literal> to speed up the
+ of <literal role="sysvar">read_rnd_buffer_size</literal> to speed up the
reading of rows following sorting operations.
</para>
@@ -15134,7 +15134,7 @@
The thread has connected to the master and is waiting for
binary log events to arrive. This can last for a long time
if the master is idle. If the wait lasts for
- <literal>slave_net_timeout</literal> seconds, a timeout
+ <literal role="sysvar">slave_net_timeout</literal> seconds, a timeout
occurs. At that point, the thread considers the connection
to be broken and makes an attempt to reconnect.
</para>
@@ -15227,7 +15227,7 @@
<para>
You are using a non-zero
- <literal>relay_log_space_limit</literal> value, and the
+ <literal role="sysvar">relay_log_space_limit</literal> value, and the
relay logs have grown large enough that their combined
size exceeds this value. The I/O thread is waiting until
the SQL thread frees enough space by processing relay log
@@ -16348,7 +16348,7 @@
When reading rows in an arbitrary sequence (for example,
following a sort), a <firstterm>random-read
buffer</firstterm> (variable
- <literal>read_rnd_buffer_size</literal>) may be allocated in
+ <literal role="sysvar">read_rnd_buffer_size</literal>) may be allocated in
order to avoid disk seeks.
</para>
</listitem>
Modified: trunk/refman-5.1/precision-math.xml
===================================================================
--- trunk/refman-5.1/precision-math.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/precision-math.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1967 bytes
@@ -132,7 +132,7 @@
type. Similarly, you can treat division by zero as an error
rather than as an operation that produces a result of
<literal>NULL</literal>. The choice of which approach to take is
- determined by the setting of the <literal>sql_mode</literal>
+ determined by the setting of the <literal role="sysvar">sql_mode</literal>
system variable.
</para>
</listitem>
@@ -149,7 +149,7 @@
math works (including possible incompatibilities with older
applications). At the end, some examples are given that demonstrate
how MySQL ¤t-series; handles numeric operations precisely. For
- information about using the <literal>sql_mode</literal> system
+ information about using the <literal role="sysvar">sql_mode</literal> system
variable to control the SQL mode, see
<xref linkend="server-sql-mode"/>.
</para>
@@ -486,7 +486,7 @@
<para>
Inserts into numeric columns are affected by the SQL mode, which
- is controlled by the <literal>sql_mode</literal> system variable.
+ is controlled by the <literal role="sysvar">sql_mode</literal> system variable.
(See <xref linkend="server-sql-mode"/>.) The following discussion
mentions strict mode (selected by the
<literal>STRICT_ALL_TABLES</literal> or
@@ -589,7 +589,7 @@
<colspec colwidth="50*"/>
<tbody>
<row>
- <entry><emphasis role="bold"><literal>sql_mode</literal> Value</emphasis></entry>
+ <entry><emphasis role="bold"><literal role="sysvar">sql_mode</literal> Value</emphasis></entry>
<entry><emphasis role="bold">Result</emphasis></entry>
</row>
<row>
Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/programs-admin-util-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1621 bytes
@@ -825,7 +825,7 @@
<entry>262136</entry>
</row>
<row>
- <entry><literal>sort_buffer_size</literal></entry>
+ <entry><literal role="sysvar">sort_buffer_size</literal></entry>
<entry>2097144</entry>
</row>
<row>
@@ -851,7 +851,7 @@
</para>
<para>
- <literal>sort_buffer_size</literal> is used when the keys are
+ <literal role="sysvar">sort_buffer_size</literal> is used when the keys are
repaired by sorting keys, which is the normal case when you use
<option>--recover</option>.
</para>
@@ -897,7 +897,7 @@
<para>
If you want a faster repair, set the
<literal role="sysvar">key_buffer_size</literal> and
- <literal>sort_buffer_size</literal> variables to about 25% of
+ <literal role="sysvar">sort_buffer_size</literal> variables to about 25% of
your available memory. You can set both variables to large
values, because only one of them is used at a time.
</para>
@@ -1526,7 +1526,7 @@
<para>
If you have lots of memory, you should increase the value of
- <literal>sort_buffer_size</literal>.
+ <literal role="sysvar">sort_buffer_size</literal>.
</para>
</listitem>
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/replication-configuration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 6; 2380 bytes
@@ -1467,7 +1467,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
</listitem>
@@ -2097,7 +2097,7 @@
<listitem>
<formalpara>
- <title>Binary log execution errors and <literal>slave_exec_mode</literal></title>
+ <title>Binary log execution errors and <literal role="sysvar">slave_exec_mode</literal></title>
<para>
If you use <literal>slave_exec_mode=IDEMPOTENT</literal>,
@@ -2110,7 +2110,7 @@
using <literal>slave_exec_mode=IDEMPOTENT</literal> and
RBR can cause the master and slave to diverge even
further. For more information about
- <literal>slave_exec_mode</literal>, see
+ <literal role="sysvar">slave_exec_mode</literal>, see
<xref linkend="server-system-variables"/>.
</para>
@@ -2162,10 +2162,10 @@
statements, a simple example of such a clause being
<literal>WHERE @server_id <> 1</literal>. This does
not work correctly with RBL. If you must use the
- <literal>server_id</literal> system variable for statement
+ <literal role="sysvar">server_id</literal> system variable for statement
filtering, then you should use
<option>--row-format=STATEMENT</option>. For more
- information about <literal>server_id</literal>, see
+ information about <literal role="sysvar">server_id</literal>, see
<xref linkend="server-system-variables"/>.
</para>
@@ -2336,7 +2336,7 @@
this is not strictly true. For example, this can occur if
the network connection between master and slave is broken
but the slave I/O thread has not yet noticed this —
- that is, <literal>slave_net_timeout</literal> has not yet
+ that is, <literal role="sysvar">slave_net_timeout</literal> has not yet
elapsed.
</para>
Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/replication-notes.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 5, Lines Deleted: 5; 2256 bytes
@@ -1515,9 +1515,9 @@
slave also is able to deal with network connectivity outages.
However, the slave notices the network outage only after
receiving no data from the master for
- <literal>slave_net_timeout</literal> seconds. If your outages
+ <literal role="sysvar">slave_net_timeout</literal> seconds. If your outages
are short, you may want to decrease
- <literal>slave_net_timeout</literal>. See
+ <literal role="sysvar">slave_net_timeout</literal>. See
<xref linkend="server-system-variables"/>.
</para>
@@ -1788,7 +1788,7 @@
<para>
The global system variable
- <literal>slave_transaction_retries</literal> affects replication
+ <literal role="sysvar">slave_transaction_retries</literal> affects replication
as follows: If the replication slave SQL thread fails to execute
a transaction because of an <literal>InnoDB</literal> deadlock
or because it exceeded the <literal>InnoDB</literal>
@@ -1797,7 +1797,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal> value, the
transaction is automatically retried
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 10. The total retry
count can be seen in the output of <literal role="stmt">SHOW
STATUS</literal>; see <xref linkend="server-status-variables"/>.
@@ -1948,7 +1948,7 @@
</para>
<para>
- <literal>sql_mode</literal> is also replicated except for the
+ <literal role="sysvar">sql_mode</literal> is also replicated except for the
<literal>NO_DIR_IN_CREATE</literal> mode. However, when
<command>mysqlbinlog</command> parses a <literal>SET @@sql_mode
= <replaceable>value</replaceable></literal> statement, the full
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/replication-options-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 13, Lines Added: 13, Lines Deleted: 13; 4149 bytes
@@ -20,7 +20,7 @@
section following this one).
</para>
- <para id="option_mysqld_server-id">
+ <para id="sysvar_server_id">
<indexterm>
<primary>server_id system variable</primary>
</indexterm>
@@ -482,7 +482,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_exec_mode">
+ <para id="sysvar_slave_exec_mode">
<indexterm>
<primary>slave_exec_mode system variable</primary>
</indexterm>
@@ -492,7 +492,7 @@
<secondary>slave_exec_mode</secondary>
</indexterm>
- <literal>slave_exec_mode</literal>
+ <literal role="sysvar">slave_exec_mode</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slave_exec_mode"/>
@@ -512,7 +512,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_transaction_retries">
+ <para id="sysvar_slave_transaction_retries">
<indexterm>
<primary>slave_transaction_retries system variable</primary>
</indexterm>
@@ -522,7 +522,7 @@
<secondary>slave_transaction_retries</secondary>
</indexterm>
- <literal>slave_transaction_retries</literal>
+ <literal role="sysvar">slave_transaction_retries</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slave_transaction_retries"/>
@@ -535,7 +535,7 @@
<literal>TransactionDeadlockDetectionTimeout</literal> or
<literal>TransactionInactiveTimeout</literal>, it
automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 10.
</para>
</listitem>
@@ -563,7 +563,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_load_tmpdir">
+ <para id="sysvar_slave_load_tmpdir">
<indexterm>
<primary>slave_load_tmpdir system variable</primary>
</indexterm>
@@ -573,7 +573,7 @@
<secondary>slave_load_tmpdir</secondary>
</indexterm>
- <literal>slave_load_tmpdir</literal>
+ <literal role="sysvar">slave_load_tmpdir</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slave-load-tmpdir"/>
@@ -587,7 +587,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_net_timeout">
+ <para id="sysvar_slave_net_timeout">
<indexterm>
<primary>slave_net_timeout system variable</primary>
</indexterm>
@@ -597,7 +597,7 @@
<secondary>slave_net_timeout</secondary>
</indexterm>
- <literal>slave_net_timeout</literal>
+ <literal role="sysvar">slave_net_timeout</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slave-net-timeout"/>
@@ -621,7 +621,7 @@
<secondary>slave_skip_errors</secondary>
</indexterm>
- <literal>slave_skip_errors</literal>
+ <literal role="sysvar">slave_skip_errors</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:slave-skip-errors"/>
@@ -2269,7 +2269,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_slave_skip_counter">
+ <para id="sysvar_sql_slave_skip_counter">
<indexterm>
<primary>sql_slave_skip_counter system variable</primary>
</indexterm>
@@ -2279,7 +2279,7 @@
<secondary>sql_slave_skip_counter</secondary>
</indexterm>
- <literal>sql_slave_skip_counter</literal>
+ <literal role="sysvar">sql_slave_skip_counter</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:sql_slave_skip_counter"/>
Modified: trunk/refman-5.1/replication-solutions.xml
===================================================================
--- trunk/refman-5.1/replication-solutions.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/replication-solutions.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1479 bytes
@@ -289,7 +289,7 @@
<para>
It is possible to back up either master or slave servers in a
replication setup by acquiring a global read lock and
- manipulating the <literal>read_only</literal> system variable to
+ manipulating the <literal role="sysvar">read_only</literal> system variable to
change the read-only state of the server to be backed up:
</para>
@@ -323,7 +323,7 @@
<para>
These instructions require MySQL 5.1.15 or higher. For earlier
- versions, setting <literal>read_only</literal> did not block
+ versions, setting <literal role="sysvar">read_only</literal> did not block
while table locks or outstanding transactions were pending, so
that some data changes could still occur during the backup.
</para>
@@ -529,7 +529,7 @@
<para>
In either scenario, the statements to acquire the global read
- lock and manipulate the <literal>read_only</literal> variable
+ lock and manipulate the <literal role="sysvar">read_only</literal> variable
are performed on the server to be backed up and do not propagate
to any slaves of that server.
</para>
Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1486 bytes
@@ -3232,7 +3232,7 @@
</programlisting>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time an event is created, and
always executes the event with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
@@ -4221,7 +4221,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a routine is created, and
always executes the routine with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
@@ -7521,7 +7521,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a trigger is created, and
always executes the trigger with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
Modified: trunk/refman-5.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/sql-syntax-replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1086 bytes
@@ -565,7 +565,7 @@
Setting <replaceable>interval</replaceable> to 0 disables
heartbeats altogether. The default value for
<replaceable>interval</replaceable> is equal to the value of
- <literal>slave_net_timeout</literal> divided by 2.
+ <literal role="sysvar">slave_net_timeout</literal> divided by 2.
</para>
<note>
@@ -628,7 +628,7 @@
<emphasis>deletes all relay log files</emphasis> and starts a
new one, unless you specify <literal>RELAY_LOG_FILE</literal> or
<literal>RELAY_LOG_POS</literal>. In that case, relay logs are
- kept; the <literal>relay_log_purge</literal> global variable is
+ kept; the <literal role="sysvar">relay_log_purge</literal> global variable is
set silently to 0.
</para>
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 504 bytes
@@ -9135,7 +9135,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para>
Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes
@@ -9216,7 +9216,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para>
Modified: trunk/refman-6.0/backup.xml
===================================================================
--- trunk/refman-6.0/backup.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/backup.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 691 bytes
@@ -3152,7 +3152,7 @@
<note>
<para>
If you want a repair operation to go much faster, you should
- set the values of the <literal>sort_buffer_size</literal> and
+ set the values of the <literal role="sysvar">sort_buffer_size</literal> and
<literal role="sysvar">key_buffer_size</literal> variables
each to about 25% of your available memory when running
<command>myisamchk</command>.
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/data-types.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 665 bytes
@@ -3641,7 +3641,7 @@
To enable <literal>MAXDB</literal> mode, set the server SQL
mode to <literal>MAXDB</literal> at startup using the
<option>--sql-mode=MAXDB</option> server option or by setting
- the global <literal>sql_mode</literal> variable at runtime:
+ the global <literal role="sysvar">sql_mode</literal> variable at runtime:
</para>
<programlisting>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/dba-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 85, Lines Added: 98, Lines Deleted: 98; 30143 bytes
@@ -2725,7 +2725,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-external-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -7777,7 +7777,7 @@
writing to the client,
<literal role="sysvar">net_write_timeout</literal> is the
timeout value controlling when to abort. See also
- <literal>slave_net_timeout</literal>.
+ <literal role="sysvar">slave_net_timeout</literal>.
</para>
</listitem>
@@ -8506,14 +8506,14 @@
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_read_only">
+ <para id="sysvar_read_only">
<indexterm>
<primary>read_only system variable</primary>
</indexterm>
@@ -8523,7 +8523,7 @@
<secondary>read_only</secondary>
</indexterm>
- <literal>read_only</literal>
+ <literal role="sysvar">read_only</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:read_only"/>
@@ -8540,10 +8540,10 @@
</para>
<para>
- <literal>read_only</literal> exists only as a
+ <literal role="sysvar">read_only</literal> exists only as a
<literal>GLOBAL</literal> variable, so changes to its value
require the <literal role="priv">SUPER</literal> privilege.
- Changes to <literal>read_only</literal> on a master server
+ Changes to <literal role="sysvar">read_only</literal> on a master server
are not replicated to slave servers. The value can be set on
a slave server independent of the setting on the master.
</para>
@@ -8556,7 +8556,7 @@
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal>
+ If you attempt to enable <literal role="sysvar">read_only</literal>
while you have any explicit locks (acquired with
<literal role="stmt">LOCK TABLES</literal>) or have a
pending transaction, an error occurs.
@@ -8565,20 +8565,20 @@
<listitem>
<para>
- If you attempt to enable <literal>read_only</literal>
+ If you attempt to enable <literal role="sysvar">read_only</literal>
while other clients hold explicit table locks or have
pending transactions, the attempt blocks until the locks
are released and the transactions end. While the attempt
- to enable <literal>read_only</literal> is pending,
+ to enable <literal role="sysvar">read_only</literal> is pending,
requests by other clients for table locks or to begin
transactions also block until
- <literal>read_only</literal> has been set.
+ <literal role="sysvar">read_only</literal> has been set.
</para>
</listitem>
<listitem>
<para>
- <literal>read_only</literal> can be enabled while you
+ <literal role="sysvar">read_only</literal> can be enabled while you
hold a global read lock (acquired with
<literal role="stmt" condition="flush">FLUSH TABLES WITH
READ LOCK</literal>) because that does not involve table
@@ -8590,7 +8590,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_read_rnd_buffer_size">
+ <para id="sysvar_read_rnd_buffer_size">
<indexterm>
<primary>read_rnd_buffer_size system variable</primary>
</indexterm>
@@ -8600,7 +8600,7 @@
<secondary>read_rnd_buffer_size</secondary>
</indexterm>
- <literal>read_rnd_buffer_size</literal>
+ <literal role="sysvar">read_rnd_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:read_rnd_buffer_size"/>
@@ -8619,19 +8619,19 @@
<para>
The maximum allowable setting for
- <literal>read_rnd_buffer_size</literal> is 2GB.
+ <literal role="sysvar">read_rnd_buffer_size</literal> is 2GB.
</para>
<para>
<literal role="sysvar">read_buffer_size</literal> and
- <literal>read_rnd_buffer_size</literal> are not specific to
+ <literal role="sysvar">read_rnd_buffer_size</literal> are not specific to
any storage engine and apply in a general manner for
optimization. See <xref linkend="memory-use"/>, for example.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_purge">
+ <para id="sysvar_relay_log_purge">
<indexterm>
<primary>relay_log_purge system variable</primary>
</indexterm>
@@ -8641,7 +8641,7 @@
<secondary>relay_log_purge</secondary>
</indexterm>
- <literal>relay_log_purge</literal>
+ <literal role="sysvar">relay_log_purge</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_purge"/>
@@ -8654,7 +8654,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_relay_log_space_limit">
+ <para id="sysvar_relay_log_space_limit">
<indexterm>
<primary>relay_log_space_limit system variable</primary>
</indexterm>
@@ -8664,7 +8664,7 @@
<secondary>relay_log_space_limit</secondary>
</indexterm>
- <literal>relay_log_space_limit</literal>
+ <literal role="sysvar">relay_log_space_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_space_limit"/>
@@ -8685,7 +8685,7 @@
<secondary>report_host</secondary>
</indexterm>
- <literal>report_host</literal>
+ <literal role="sysvar">report_host</literal>
</para>
<para>
@@ -8705,7 +8705,7 @@
<secondary>report_password</secondary>
</indexterm>
- <literal>report_password</literal>
+ <literal role="sysvar">report_password</literal>
</para>
<para>
@@ -8725,7 +8725,7 @@
<secondary>report_port</secondary>
</indexterm>
- <literal>report_port</literal>
+ <literal role="sysvar">report_port</literal>
</para>
<para>
@@ -8745,7 +8745,7 @@
<secondary>report_user</secondary>
</indexterm>
- <literal>report_user</literal>
+ <literal role="sysvar">report_user</literal>
</para>
<para>
@@ -8765,7 +8765,7 @@
<secondary>rpl_recovery_rank</secondary>
</indexterm>
- <literal>rpl_recovery_rank</literal>
+ <literal role="sysvar">rpl_recovery_rank</literal>
</para>
<para>
@@ -8931,7 +8931,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_auth">
+ <para id="sysvar_secure_auth">
<indexterm>
<primary>secure_auth system variable</primary>
</indexterm>
@@ -8941,7 +8941,7 @@
<secondary>secure_auth</secondary>
</indexterm>
- <literal>secure_auth</literal>
+ <literal role="sysvar">secure_auth</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:secure-auth"/>
@@ -8969,7 +8969,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_secure_file_priv">
+ <para id="sysvar_secure_file_priv">
<indexterm>
<primary>secure_file_priv system variable</primary>
</indexterm>
@@ -8979,7 +8979,7 @@
<secondary>secure_file_priv</secondary>
</indexterm>
- <literal>secure_file_priv</literal>
+ <literal role="sysvar">secure_file_priv</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:secure-file-priv"/>
@@ -8997,7 +8997,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_server-id">
+ <para id="sysvar_server_id">
<indexterm>
<primary>server_id system variable</primary>
</indexterm>
@@ -9007,7 +9007,7 @@
<secondary>server_id</secondary>
</indexterm>
- <literal>server_id</literal>
+ <literal role="sysvar">server_id</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
@@ -9021,7 +9021,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory">
+ <para id="sysvar_shared_memory">
<indexterm>
<primary>shared_memory system variable</primary>
</indexterm>
@@ -9031,7 +9031,7 @@
<secondary>shared_memory</secondary>
</indexterm>
- <literal>shared_memory</literal>
+ <literal role="sysvar">shared_memory</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:shared_memory"/>
@@ -9043,7 +9043,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_shared_memory_base_name">
+ <para id="sysvar_shared_memory_base_name">
<indexterm>
<primary>shared_memory_base_name system variable</primary>
</indexterm>
@@ -9053,7 +9053,7 @@
<secondary>shared_memory_base_name</secondary>
</indexterm>
- <literal>shared_memory_base_name</literal>
+ <literal role="sysvar">shared_memory_base_name</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:shared_memory_base_name"/>
@@ -9068,7 +9068,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip-exernal-locking">
+ <para id="sysvar_skip_external_locking">
<indexterm>
<primary>external locking</primary>
</indexterm>
@@ -9087,7 +9087,7 @@
<secondary>skip_external_locking</secondary>
</indexterm>
- <literal>skip_external_locking</literal>
+ <literal role="sysvar">skip_external_locking</literal>
</para>
<para>
@@ -9108,7 +9108,7 @@
<secondary>skip_networking</secondary>
</indexterm>
- <literal>skip_networking</literal>
+ <literal role="sysvar">skip_networking</literal>
</para>
<para>
@@ -9124,7 +9124,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_skip_show_database">
+ <para id="sysvar_skip_show_database">
<indexterm>
<primary>skip_show_database system variable</primary>
</indexterm>
@@ -9134,7 +9134,7 @@
<secondary>skip_show_database</secondary>
</indexterm>
- <literal>skip_show_database</literal>
+ <literal role="sysvar">skip_show_database</literal>
</para>
<para>
@@ -9180,7 +9180,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_exec_mode">
+ <para id="sysvar_slave_exec_mode">
<indexterm>
<primary>slave_exec_mode system variable</primary>
</indexterm>
@@ -9190,7 +9190,7 @@
<secondary>slave_exec_mode</secondary>
</indexterm>
- <literal>slave_exec_mode</literal>
+ <literal role="sysvar">slave_exec_mode</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slave_exec_mode"/>
@@ -9210,7 +9210,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_load_tmpdir">
+ <para id="sysvar_slave_load_tmpdir">
<indexterm>
<primary>slave_load_tmpdir system variable</primary>
</indexterm>
@@ -9220,7 +9220,7 @@
<secondary>slave_load_tmpdir</secondary>
</indexterm>
- <literal>slave_load_tmpdir</literal>
+ <literal role="sysvar">slave_load_tmpdir</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slave-load-tmpdir"/>
@@ -9234,7 +9234,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_net_timeout">
+ <para id="sysvar_slave_net_timeout">
<indexterm>
<primary>slave_net_timeout system variable</primary>
</indexterm>
@@ -9244,7 +9244,7 @@
<secondary>slave_net_timeout</secondary>
</indexterm>
- <literal>slave_net_timeout</literal>
+ <literal role="sysvar">slave_net_timeout</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slave-net-timeout"/>
@@ -9269,7 +9269,7 @@
<secondary>slave_skip_errors</secondary>
</indexterm>
- <literal>slave_skip_errors</literal>
+ <literal role="sysvar">slave_skip_errors</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slave-skip-errors"/>
@@ -9284,7 +9284,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slave_transaction_retries">
+ <para id="sysvar_slave_transaction_retries">
<indexterm>
<primary>slave_transaction_retries system variable</primary>
</indexterm>
@@ -9294,7 +9294,7 @@
<secondary>slave_transaction_retries</secondary>
</indexterm>
- <literal>slave_transaction_retries</literal>
+ <literal role="sysvar">slave_transaction_retries</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slave_transaction_retries"/>
@@ -9305,13 +9305,13 @@
or exceeded <literal>InnoDB</literal>'s
<literal>innodb_lock_wait_timeout</literal>, it
automatically retries
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 10.
</para>
</listitem>
<listitem>
- <para id="option_mysqld_slow_launch_time">
+ <para id="sysvar_slow_launch_time">
<indexterm>
<primary>slow_launch_time system variable</primary>
</indexterm>
@@ -9321,7 +9321,7 @@
<secondary>slow_launch_time</secondary>
</indexterm>
- <literal>slow_launch_time</literal>
+ <literal role="sysvar">slow_launch_time</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slow_launch_time"/>
@@ -9334,7 +9334,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_query_log">
+ <para id="sysvar_slow_query_log">
<indexterm>
<primary>slow_query_log system variable</primary>
</indexterm>
@@ -9344,7 +9344,7 @@
<secondary>slow_query_log</secondary>
</indexterm>
- <literal>slow_query_log</literal>
+ <literal role="sysvar">slow_query_log</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slow_query_log"/>
@@ -9363,7 +9363,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_slow_query_log_file">
+ <para id="sysvar_slow_query_log_file">
<indexterm>
<primary>slow_query_log_file system variable</primary>
</indexterm>
@@ -9373,7 +9373,7 @@
<secondary>slow_query_log_file</secondary>
</indexterm>
- <literal>slow_query_log_file</literal>
+ <literal role="sysvar">slow_query_log_file</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:slow_query_log_file"/>
@@ -9398,7 +9398,7 @@
<secondary>socket</secondary>
</indexterm>
- <literal>socket</literal>
+ <literal role="sysvar">socket</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:socket"/>
@@ -9419,7 +9419,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sort_buffer_size">
+ <para id="sysvar_sort_buffer_size">
<indexterm>
<primary>sort_buffer_size system variable</primary>
</indexterm>
@@ -9429,7 +9429,7 @@
<secondary>sort_buffer_size</secondary>
</indexterm>
- <literal>sort_buffer_size</literal>
+ <literal role="sysvar">sort_buffer_size</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:sort_buffer_size"/>
@@ -9443,7 +9443,7 @@
<para>
The maximum allowable setting for
- <literal>sort_buffer_size</literal> is 4GB. As of MySQL
+ <literal role="sysvar">sort_buffer_size</literal> is 4GB. As of MySQL
5.2.6, 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).
@@ -9451,7 +9451,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_mode">
+ <para id="sysvar_sql_mode">
<indexterm>
<primary>sql_mode system variable</primary>
</indexterm>
@@ -9461,7 +9461,7 @@
<secondary>sql_mode</secondary>
</indexterm>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:sql-mode"/>
@@ -9473,7 +9473,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_select_limit">
+ <para id="sysvar_sql_select_limit">
<indexterm>
<primary>sql_select_limit system variable</primary>
</indexterm>
@@ -9483,7 +9483,7 @@
<secondary>sql_select_limit</secondary>
</indexterm>
- <literal>sql_select_limit</literal>
+ <literal role="sysvar">sql_select_limit</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:sql_select_limit"/>
@@ -9506,11 +9506,11 @@
If a <literal role="stmt">SELECT</literal> has a
<literal>LIMIT</literal> clause, the
<literal>LIMIT</literal> takes precedence over the value of
- <literal>sql_select_limit</literal>.
+ <literal role="sysvar">sql_select_limit</literal>.
</para>
<para>
- <literal>sql_select_limit</literal> does not apply to
+ <literal role="sysvar">sql_select_limit</literal> does not apply to
<literal role="stmt">SELECT</literal> statements executed
within stored routines. It also does not apply to
<literal role="stmt">SELECT</literal> statements that do not
@@ -9522,7 +9522,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_sql_slave_skip_counter">
+ <para id="sysvar_sql_slave_skip_counter">
<indexterm>
<primary>sql_slave_skip_counter system variable</primary>
</indexterm>
@@ -9532,7 +9532,7 @@
<secondary>sql_slave_skip_counter</secondary>
</indexterm>
- <literal>sql_slave_skip_counter</literal>
+ <literal role="sysvar">sql_slave_skip_counter</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:sql_slave_skip_counter"/>
@@ -9556,7 +9556,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-ca">
+ <para id="sysvar_ssl_ca">
<indexterm>
<primary>ssl_ca system variable</primary>
</indexterm>
@@ -9566,7 +9566,7 @@
<secondary>ssl_ca</secondary>
</indexterm>
- <literal>ssl_ca</literal>
+ <literal role="sysvar">ssl_ca</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:ssl-ca"/>
@@ -9577,7 +9577,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-capath">
+ <para id="sysvar_ssl_capath">
<indexterm>
<primary>ssl_capath system variable</primary>
</indexterm>
@@ -9587,7 +9587,7 @@
<secondary>ssl_capath</secondary>
</indexterm>
- <literal>ssl_capath</literal>
+ <literal role="sysvar">ssl_capath</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:ssl-capath"/>
@@ -9599,7 +9599,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cert">
+ <para id="sysvar_ssl_cert">
<indexterm>
<primary>ssl_cert system variable</primary>
</indexterm>
@@ -9609,7 +9609,7 @@
<secondary>ssl_cert</secondary>
</indexterm>
- <literal>ssl_cert</literal>
+ <literal role="sysvar">ssl_cert</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:ssl-cert"/>
@@ -9621,7 +9621,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-cipher">
+ <para id="sysvar_ssl_cipher">
<indexterm>
<primary>ssl_cipher system variable</primary>
</indexterm>
@@ -9631,7 +9631,7 @@
<secondary>ssl_cipher</secondary>
</indexterm>
- <literal>ssl_cipher</literal>
+ <literal role="sysvar">ssl_cipher</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:ssl-cipher"/>
@@ -9642,7 +9642,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-key">
+ <para id="sysvar_ssl_key">
<indexterm>
<primary>ssl_key system variable</primary>
</indexterm>
@@ -9652,7 +9652,7 @@
<secondary>ssl_key</secondary>
</indexterm>
- <literal>ssl_key</literal>
+ <literal role="sysvar">ssl_key</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:ssl-key"/>
@@ -10191,7 +10191,7 @@
directory are lost when the server restarts, replication
fails. However, if you are using MySQL 4.0.0 or later, you
can set the slave's temporary directory using the
- <literal>slave_load_tmpdir</literal> variable. In that case,
+ <literal role="sysvar">slave_load_tmpdir</literal> variable. In that case,
the slave won't use the general <literal>tmpdir</literal>
value and you can set <literal>tmpdir</literal> to a
non-permanent location.
@@ -11290,9 +11290,9 @@
are initialized at connect time using the current values of
the corresponding global variables. For example, the
client's SQL mode is controlled by the session
- <literal>sql_mode</literal> value, which is initialized when
+ <literal role="sysvar">sql_mode</literal> value, which is initialized when
the client connects to the value of the global
- <literal>sql_mode</literal> value.
+ <literal role="sysvar">sql_mode</literal> value.
</para>
</listitem>
@@ -13814,7 +13814,7 @@
<para>
The number of threads that have taken more than
- <literal>slow_launch_time</literal> seconds to create.
+ <literal role="sysvar">slow_launch_time</literal> seconds to create.
</para>
</listitem>
@@ -13839,7 +13839,7 @@
The number of merge passes that the sort algorithm has had
to do. If this value is large, you should consider
increasing the value of the
- <literal>sort_buffer_size</literal> system variable.
+ <literal role="sysvar">sort_buffer_size</literal> system variable.
</para>
</listitem>
@@ -14307,13 +14307,13 @@
You can change the SQL mode at runtime by using a <literal>SET
[GLOBAL|SESSION]
sql_mode='<replaceable>modes</replaceable>'</literal> statement
- to set the <literal>sql_mode</literal> system value. Setting the
+ to set the <literal role="sysvar">sql_mode</literal> system value. Setting the
<literal>GLOBAL</literal> variable requires the
<literal role="priv">SUPER</literal> privilege and affects the
operation of all clients that connect from that time on. Setting
the <literal>SESSION</literal> variable affects only the current
client. Any client can change its own session
- <literal>sql_mode</literal> value at any time.
+ <literal role="sysvar">sql_mode</literal> value at any time.
</para>
<important>
@@ -14340,7 +14340,7 @@
<para>
You can retrieve the current global or session
- <literal>sql_mode</literal> value with the following statements:
+ <literal role="sysvar">sql_mode</literal> value with the following statements:
</para>
<programlisting>
@@ -14349,7 +14349,7 @@
</programlisting>
<para>
- The most important <literal>sql_mode</literal> values are
+ The most important <literal role="sysvar">sql_mode</literal> values are
probably these:
</para>
@@ -16012,7 +16012,7 @@
<listitem>
<para>
The global <literal role="sysvar">general_log</literal> and
- <literal>slow_query_log</literal> variables indicate whether
+ <literal role="sysvar">slow_query_log</literal> variables indicate whether
the general query log and slow query log are enabled
(<literal>ON</literal>) or disabled
(<literal>OFF</literal>). You can set these variables at
@@ -16023,7 +16023,7 @@
<listitem>
<para>
The global <literal role="sysvar">general_log_file</literal>
- and <literal>slow_query_log_file</literal> variables
+ and <literal role="sysvar">slow_query_log_file</literal> variables
indicate the names of the general query log and slow query
log files. As of MySQL 6.0.8, you can set these variables at
server startup or at runtime to change the names of the log
@@ -16140,7 +16140,7 @@
table, you can use the following strategy. The example uses
the general query log; the procedure for the slow query log
is similar but uses the <literal>slow_log</literal> table
- and <literal>slow_query_log</literal> system variable.
+ and <literal role="sysvar">slow_query_log</literal> system variable.
</para>
<programlisting>
@@ -16194,7 +16194,7 @@
<listitem>
<para>
The global read lock and the state of the global
- <literal>read_only</literal> system variable have no effect
+ <literal role="sysvar">read_only</literal> system variable have no effect
on log tables. The server can always write to the log
tables.
</para>
@@ -17109,7 +17109,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
</listitem>
@@ -18070,9 +18070,9 @@
<para>
For runtime control of the general query log, use the global
- <literal>slow_query_log</literal> and
- <literal>slow_query_log_file</literal> system variables. Set
- <literal>slow_query_log</literal> to 0 (or
+ <literal role="sysvar">slow_query_log</literal> and
+ <literal role="sysvar">slow_query_log_file</literal> system variables. Set
+ <literal role="sysvar">slow_query_log</literal> to 0 (or
<literal>OFF</literal>) to disable the log or to 1 (or
<literal>ON</literal>) to enable it. Set
<literal role="sysvar">general_log_file</literal> to specify the
@@ -19949,7 +19949,7 @@
</row>
<row>
<entry/>
- <entry><literal>ssl_cipher</literal></entry>
+ <entry><literal role="sysvar">ssl_cipher</literal></entry>
<entry/>
</row>
<row>
@@ -23954,7 +23954,7 @@
If strict SQL mode is enabled, all columns that have no default
value must have a value specified. In this case,
<literal role="stmt">INSERT</literal> statements must explicitly
- specify values for the <literal>ssl_cipher</literal>,
+ specify values for the <literal role="sysvar">ssl_cipher</literal>,
<literal>x509_issuer</literal>, and
<literal>x509_subject</literal> columns.
</para>
@@ -25339,7 +25339,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_ssl-verify-server-cert">
+ <para id="option_mysqld_ssl_verify-server-cert">
<indexterm>
<primary>ssl-verify-server-cert option</primary>
</indexterm>
Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/errors-problems.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 606 bytes
@@ -4088,7 +4088,7 @@
<para>
If you want MySQL to check all dates and accept only legal
dates (unless overridden by IGNORE), you should set
- <literal>sql_mode</literal> to
+ <literal role="sysvar">sql_mode</literal> to
<literal>"NO_ZERO_IN_DATE,NO_ZERO_DATE"</literal>.
</para>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/functions-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 840 bytes
@@ -17991,14 +17991,14 @@
<listitem>
<para>
- The <literal>server_id</literal> of the current host is
+ The <literal role="sysvar">server_id</literal> of the current host is
unique among your set of master and slave servers
</para>
</listitem>
<listitem>
<para>
- <literal>server_id</literal> is between 0 and 255
+ <literal role="sysvar">server_id</literal> is between 0 and 255
</para>
</listitem>
Modified: trunk/refman-6.0/information-schema.xml
===================================================================
--- trunk/refman-6.0/information-schema.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/information-schema.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1002 bytes
@@ -2868,7 +2868,7 @@
-->
<row>
<entry><literal>SQL_MODE</literal></entry>
- <entry><literal>sql_mode</literal></entry>
+ <entry><literal role="sysvar">sql_mode</literal></entry>
<entry>MySQL extension</entry>
</row>
<row>
@@ -3409,7 +3409,7 @@
whenever it is invoked, <emphasis>regardless of the current
server SQL mode</emphasis>). The possible range of values for
this column is the same as that of the
- <literal>sql_mode</literal> system variable. See
+ <literal role="sysvar">sql_mode</literal> system variable. See
<xref linkend="server-sql-mode"/>.
</para>
</listitem>
Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/introduction.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1106 bytes
@@ -771,7 +771,7 @@
<command>mysqld</command> with the
<option>--sql-mode="<replaceable>mode_value</replaceable>"</option>
option. You can also change the mode at runtime by setting the
- <literal>sql_mode</literal> system variable with a
+ <literal role="sysvar">sql_mode</literal> system variable with a
<literal role="stmt" condition="set-option">SET [GLOBAL|SESSION]
sql_mode='<replaceable>mode_value</replaceable>'</literal>
statement.
@@ -820,7 +820,7 @@
</programlisting>
<para>
- You can see that setting the <literal>sql_mode</literal> system
+ You can see that setting the <literal role="sysvar">sql_mode</literal> system
variable to <literal>'ANSI'</literal> enables all SQL mode
options that are relevant for ANSI mode as follows:
</para>
Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/optimization.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 11, Lines Added: 12, Lines Deleted: 12; 5212 bytes
@@ -3951,9 +3951,9 @@
<para>
For MRR, a storage engine uses the value of the
- <literal>read_rnd_buffer_size</literal> system variable as a
+ <literal role="sysvar">read_rnd_buffer_size</literal> system variable as a
guideline for how much memory it can allocate for its buffer.
- The engine uses up to <literal>read_rnd_buffer_size</literal>
+ The engine uses up to <literal role="sysvar">read_rnd_buffer_size</literal>
bytes and determines the number of ranges to process in a single
pass.
</para>
@@ -5373,7 +5373,7 @@
<para>
For each row, store a pair of values in a buffer (the sort
key and the row pointer). The size of the buffer is the
- value of the <literal>sort_buffer_size</literal> system
+ value of the <literal role="sysvar">sort_buffer_size</literal> system
variable.
</para>
</listitem>
@@ -5421,7 +5421,7 @@
the result file. To optimize this, we read in a big block of
row pointers, sort them, and use them to read the rows in
sorted order into a row buffer. The size of the buffer is
- the value of the <literal>read_rnd_buffer_size</literal>
+ the value of the <literal role="sysvar">read_rnd_buffer_size</literal>
system variable. The code for this step is in the
<filename>sql/records.cc</filename> source file.
</para>
@@ -5483,7 +5483,7 @@
Using the modified <literal>filesort</literal> algorithm, the
tuples are longer than the pairs used in the original method,
and fewer of them fit in the sort buffer (the size of which is
- given by <literal>sort_buffer_size</literal>). As a result, it
+ given by <literal role="sysvar">sort_buffer_size</literal>). As a result, it
is possible for the extra I/O to make the modified approach
slower, not faster. To avoid a slowdown, the optimization is
used only if the total size of the extra columns in the sort
@@ -5513,7 +5513,7 @@
<listitem>
<para>
- Increase the size of the <literal>sort_buffer_size</literal>
+ Increase the size of the <literal role="sysvar">sort_buffer_size</literal>
variable.
</para>
</listitem>
@@ -5521,7 +5521,7 @@
<listitem>
<para>
Increase the size of the
- <literal>read_rnd_buffer_size</literal> variable.
+ <literal role="sysvar">read_rnd_buffer_size</literal> variable.
</para>
</listitem>
@@ -9083,7 +9083,7 @@
<para>
For <command>mysqld</command>, external locking is controlled by
- the value of the <literal>skip_external_locking</literal> system
+ the value of the <literal role="sysvar">skip_external_locking</literal> system
variable. (Before MySQL 4.0.3, this variable is named
<literal>skip_locking</literal>.) When this variable is enabled,
external locking is disabled, and vice versa. From MySQL 4.0 on,
@@ -11749,7 +11749,7 @@
If you are performing <literal>GROUP BY</literal> or
<literal>ORDER BY</literal> operations on tables that are much
larger than your available memory, you should increase the value
- of <literal>read_rnd_buffer_size</literal> to speed up the
+ of <literal role="sysvar">read_rnd_buffer_size</literal> to speed up the
reading of rows following sorting operations.
</para>
@@ -15488,7 +15488,7 @@
The thread has connected to the master and is waiting for
binary log events to arrive. This can last for a long time
if the master is idle. If the wait lasts for
- <literal>slave_net_timeout</literal> seconds, a timeout
+ <literal role="sysvar">slave_net_timeout</literal> seconds, a timeout
occurs. At that point, the thread considers the connection
to be broken and makes an attempt to reconnect.
</para>
@@ -15580,7 +15580,7 @@
<para>
You are using a non-zero
- <literal>relay_log_space_limit</literal> value, and the
+ <literal role="sysvar">relay_log_space_limit</literal> value, and the
relay logs have grown large enough that their combined
size exceeds this value. The I/O thread is waiting until
the SQL thread frees enough space by processing relay log
@@ -16541,7 +16541,7 @@
When reading rows in an arbitrary sequence (for example,
following a sort), a <firstterm>random-read
buffer</firstterm> (variable
- <literal>read_rnd_buffer_size</literal>) may be allocated in
+ <literal role="sysvar">read_rnd_buffer_size</literal>) may be allocated in
order to avoid disk seeks.
</para>
</listitem>
Modified: trunk/refman-6.0/precision-math.xml
===================================================================
--- trunk/refman-6.0/precision-math.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/precision-math.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1967 bytes
@@ -132,7 +132,7 @@
type. Similarly, you can treat division by zero as an error
rather than as an operation that produces a result of
<literal>NULL</literal>. The choice of which approach to take is
- determined by the setting of the <literal>sql_mode</literal>
+ determined by the setting of the <literal role="sysvar">sql_mode</literal>
system variable.
</para>
</listitem>
@@ -149,7 +149,7 @@
math works (including possible incompatibilities with older
applications). At the end, some examples are given that demonstrate
how MySQL ¤t-series; handles numeric operations precisely. For
- information about using the <literal>sql_mode</literal> system
+ information about using the <literal role="sysvar">sql_mode</literal> system
variable to control the SQL mode, see
<xref linkend="server-sql-mode"/>.
</para>
@@ -486,7 +486,7 @@
<para>
Inserts into numeric columns are affected by the SQL mode, which
- is controlled by the <literal>sql_mode</literal> system variable.
+ is controlled by the <literal role="sysvar">sql_mode</literal> system variable.
(See <xref linkend="server-sql-mode"/>.) The following discussion
mentions strict mode (selected by the
<literal>STRICT_ALL_TABLES</literal> or
@@ -589,7 +589,7 @@
<colspec colwidth="50*"/>
<tbody>
<row>
- <entry><emphasis role="bold"><literal>sql_mode</literal> Value</emphasis></entry>
+ <entry><emphasis role="bold"><literal role="sysvar">sql_mode</literal> Value</emphasis></entry>
<entry><emphasis role="bold">Result</emphasis></entry>
</row>
<row>
Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/programs-admin-util-core.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1621 bytes
@@ -825,7 +825,7 @@
<entry>262136</entry>
</row>
<row>
- <entry><literal>sort_buffer_size</literal></entry>
+ <entry><literal role="sysvar">sort_buffer_size</literal></entry>
<entry>2097144</entry>
</row>
<row>
@@ -851,7 +851,7 @@
</para>
<para>
- <literal>sort_buffer_size</literal> is used when the keys are
+ <literal role="sysvar">sort_buffer_size</literal> is used when the keys are
repaired by sorting keys, which is the normal case when you use
<option>--recover</option>.
</para>
@@ -897,7 +897,7 @@
<para>
If you want a faster repair, set the
<literal role="sysvar">key_buffer_size</literal> and
- <literal>sort_buffer_size</literal> variables to about 25% of
+ <literal role="sysvar">sort_buffer_size</literal> variables to about 25% of
your available memory. You can set both variables to large
values, because only one of them is used at a time.
</para>
@@ -1526,7 +1526,7 @@
<para>
If you have lots of memory, you should increase the value of
- <literal>sort_buffer_size</literal>.
+ <literal role="sysvar">sort_buffer_size</literal>.
</para>
</listitem>
Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/replication-configuration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 6; 2380 bytes
@@ -1437,7 +1437,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
</listitem>
@@ -2042,7 +2042,7 @@
<listitem>
<formalpara>
- <title>Binary log execution errors and <literal>slave_exec_mode</literal></title>
+ <title>Binary log execution errors and <literal role="sysvar">slave_exec_mode</literal></title>
<para>
If you use <literal>slave_exec_mode=IDEMPOTENT</literal>,
@@ -2055,7 +2055,7 @@
using <literal>slave_exec_mode=IDEMPOTENT</literal> and
RBR can cause the master and slave to diverge even
further. For more information about
- <literal>slave_exec_mode</literal>, see
+ <literal role="sysvar">slave_exec_mode</literal>, see
<xref linkend="server-system-variables"/>.
</para>
@@ -2115,10 +2115,10 @@
statements, a simple example of such a clause being
<literal>WHERE @server_id <> 1</literal>. This does
not work correctly with RBL. If you must use the
- <literal>server_id</literal> system variable for statement
+ <literal role="sysvar">server_id</literal> system variable for statement
filtering, then you should use
<option>--row-format=STATEMENT</option>. For more
- information about <literal>server_id</literal>, see
+ information about <literal role="sysvar">server_id</literal>, see
<xref linkend="server-system-variables"/>.
</para>
@@ -2289,7 +2289,7 @@
this is not strictly true. For example, this can occur if
the network connection between master and slave is broken
but the slave I/O thread has not yet noticed this —
- that is, <literal>slave_net_timeout</literal> has not yet
+ that is, <literal role="sysvar">slave_net_timeout</literal> has not yet
elapsed.
</para>
Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/replication-notes.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 5; 2182 bytes
@@ -1500,9 +1500,9 @@
statement. A slave also is able to deal with network
connectivity outages. However, the slave notices the network
outage only after receiving no data from the master for
- <literal>slave_net_timeout</literal> seconds. If your outages
+ <literal role="sysvar">slave_net_timeout</literal> seconds. If your outages
are short, you may want to decrease
- <literal>slave_net_timeout</literal>. See
+ <literal role="sysvar">slave_net_timeout</literal>. See
<xref linkend="server-system-variables"/>.
</para>
@@ -1762,13 +1762,13 @@
<para>
The global system variable
- <literal>slave_transaction_retries</literal> affects replication
+ <literal role="sysvar">slave_transaction_retries</literal> affects replication
as follows: If the replication slave SQL thread fails to execute
a transaction because of an <literal>InnoDB</literal> deadlock
or because it exceeded the <literal>InnoDB</literal>
<literal>innodb_lock_wait_timeout</literal> value, the
transaction is automatically retried
- <literal>slave_transaction_retries</literal> times before
+ <literal role="sysvar">slave_transaction_retries</literal> times before
stopping with an error. The default value is 10. The total retry
count can be seen in the output of <literal role="stmt">SHOW
STATUS</literal>; see <xref linkend="server-status-variables"/>.
@@ -1919,7 +1919,7 @@
</para>
<para>
- <literal>sql_mode</literal> is also replicated except for the
+ <literal role="sysvar">sql_mode</literal> is also replicated except for the
<literal>NO_DIR_IN_CREATE</literal> mode. However, when
<command>mysqlbinlog</command> parses a <literal>SET @@sql_mode
= <replaceable>value</replaceable></literal> statement, the full
Modified: trunk/refman-6.0/replication-solutions.xml
===================================================================
--- trunk/refman-6.0/replication-solutions.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/replication-solutions.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1070 bytes
@@ -289,7 +289,7 @@
<para>
It is possible to back up either master or slave servers in a
replication setup by acquiring a global read lock and
- manipulating the <literal>read_only</literal> system variable to
+ manipulating the <literal role="sysvar">read_only</literal> system variable to
change the read-only state of the server to be backed up:
</para>
@@ -522,7 +522,7 @@
<para>
In either scenario, the statements to acquire the global read
- lock and manipulate the <literal>read_only</literal> variable
+ lock and manipulate the <literal role="sysvar">read_only</literal> variable
are performed on the server to be backed up and do not propagate
to any slaves of that server.
</para>
Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1486 bytes
@@ -2580,7 +2580,7 @@
</programlisting>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time an event is created, and
always executes the event with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
@@ -3417,7 +3417,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a routine is created, and
always executes the routine with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
@@ -6405,7 +6405,7 @@
</para>
<para>
- MySQL stores the <literal>sql_mode</literal> system variable
+ MySQL stores the <literal role="sysvar">sql_mode</literal> system variable
setting that is in effect at the time a trigger is created, and
always executes the trigger with this setting in force,
<emphasis>regardless of the current server SQL mode</emphasis>.
Modified: trunk/refman-6.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-replication.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/sql-syntax-replication.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1086 bytes
@@ -577,7 +577,7 @@
Setting <replaceable>interval</replaceable> to 0 disables
heartbeats altogether. The default value for
<replaceable>interval</replaceable> is equal to the value of
- <literal>slave_net_timeout</literal> divided by 2.
+ <literal role="sysvar">slave_net_timeout</literal> divided by 2.
</para>
<note>
@@ -635,7 +635,7 @@
<emphasis>deletes all relay log files</emphasis> and starts a
new one, unless you specify <literal>RELAY_LOG_FILE</literal> or
<literal>RELAY_LOG_POS</literal>. In that case, relay logs are
- kept; the <literal>relay_log_purge</literal> global variable is
+ kept; the <literal role="sysvar">relay_log_purge</literal> global variable is
set silently to 0.
</para>
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 504 bytes
@@ -8875,7 +8875,7 @@
<listitem>
<para>
- <literal>sql_mode</literal>
+ <literal role="sysvar">sql_mode</literal>
</para>
<para>
Modified: trunk/refman-common/bug-reports.xml
===================================================================
--- trunk/refman-common/bug-reports.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-common/bug-reports.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 985 bytes
@@ -349,9 +349,9 @@
<para>
The SQL mode in effect when the problem occurred can be
significant, so please report the value of the
- <literal>sql_mode</literal> system variable. For stored
+ <literal role="sysvar">sql_mode</literal> system variable. For stored
procedure, stored function, and trigger objects, the relevant
- <literal>sql_mode</literal> value is the one in effect when the
+ <literal role="sysvar">sql_mode</literal> value is the one in effect when the
object was created. For a stored procedure or function, the
<literal role="stmt">SHOW CREATE PROCEDURE</literal> or
<literal role="stmt">SHOW CREATE FUNCTION</literal> statement
Modified: trunk/refman-common/connector-odbc.xml
===================================================================
--- trunk/refman-common/connector-odbc.xml 2008-12-04 00:02:58 UTC (rev 12763)
+++ trunk/refman-common/connector-odbc.xml 2008-12-04 03:12:48 UTC (rev 12764)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 694 bytes
@@ -2759,7 +2759,7 @@
<entry>Synonymous with <literal>password</literal>. Added in 3.51.16.</entry>
</row>
<row>
- <entry><literal>socket</literal></entry>
+ <entry><literal role="sysvar">socket</literal></entry>
<entry/>
<entry>The Unix socket file or Windows named pipe to connect to if
<literal>server</literal> is
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12764 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars mysql-monitor refman-4.1 refman-5.0 refman-5.1... | paul.dubois | 4 Dec |
